Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-11-04 10:38:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-11-04 10:41:40 +0300
commit819a9622e9c2a20ac461275d9788e8e0d67c879f (patch)
tree66e4f5f6fab16ee3817d05bdd2c7933652330a46 /source/creator/CMakeLists.txt
parent9af147b5d339941c0cff3d7084a9c4b497c9a854 (diff)
CMake: remove -fmacro-prefix-map from build-info
Quotes caused build-info to fail, remove these flags since they're not necessary.
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt20
1 files changed, 17 insertions, 3 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 74c2797856d..95af663d53e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -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}"