From 9762a0992b3b15f63c7c45f752ae9eafd1b17daa Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Nov 2020 17:11:27 +1100 Subject: CMake: configue_file() to pass strings for build-info Using configue_file(..) would have avoided the breakage from 1daa3c3f0a1cfd, caused by buildinfo not properly escaping quotes. Rely on CMake to escaping strings instead using configure_file(). --- build_files/cmake/buildinfo.cmake | 1 + build_files/cmake/buildinfo_static.h.in | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 build_files/cmake/buildinfo_static.h.in (limited to 'build_files') diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index babc52df748..a349ffc1b56 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -161,6 +161,7 @@ file(WRITE buildinfo.h.txt "#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n" "#define BUILD_DATE \"${BUILD_DATE}\"\n" "#define BUILD_TIME \"${BUILD_TIME}\"\n" + "#include \"buildinfo_static.h\"\n" ) # cleanup diff --git a/build_files/cmake/buildinfo_static.h.in b/build_files/cmake/buildinfo_static.h.in new file mode 100644 index 00000000000..9dd45b95b8a --- /dev/null +++ b/build_files/cmake/buildinfo_static.h.in @@ -0,0 +1,8 @@ +/* CMake expanded values that won't change between CMake execution (unlike date/time). + * This is included by `buildinfo.h` generated by `buildinfo.cmake`. */ +#define BUILD_PLATFORM "@BUILD_PLATFORM@" +#define BUILD_TYPE "@BUILD_TYPE@" +#define BUILD_CFLAGS "@BUILD_CFLAGS@" +#define BUILD_CXXFLAGS "@BUILD_CXXFLAGS@" +#define BUILD_LINKFLAGS "@BUILD_LINKFLAGS@" +#define BUILD_SYSTEM "@BUILD_SYSTEM@" -- cgit v1.2.3