Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: remove -fmacro-prefix-map from build-info

Browse Source 
Quotes caused build-info to fail,
remove these flags since they're not necessary.
This commit is contained in:
Campbell Barton
2020-11-04 18:38:49 +11:00
parent 9af147b5d3
commit 819a9622e9
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/creator/CMakeLists.txt
View File

@@ -152,9 +152,23 @@ if(WITH_BUILDINFO)
add_definitions(-DWITH_BUILDINFO)
# --------------------------------------------------------------------------
# These defines could all be moved into the header below
string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
set(BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
set(BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
set(BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
if(WITH_COMPILER_SHORT_FILE_MACRO)
# Needed because currently including quotes isn't supported.
# Besides this it's not necessary to include path information
# about the system building Blender in the executable.
string(REPLACE "${PLATFORM_CFLAGS_FMACRO_PREFIX_MAP}" " " BUILDINFO_CFLAGS "${BUILDINFO_CFLAGS}")
string(REPLACE "${PLATFORM_CFLAGS_FMACRO_PREFIX_MAP}" " " BUILDINFO_CXXFLAGS "${BUILDINFO_CXXFLAGS}")
endif()
string(REPLACE " " "\ " BUILDINFO_CFLAGS "${BUILDINFO_CFLAGS}")
string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${BUILDINFO_CXXFLAGS}")
string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${BUILDINFO_LINKFLAGS}")
add_definitions(
# # define in header now, else these get out of date on rebuilds.
# -DBUILD_DATE="${BUILD_DATE}"