diff --git a/CMakeLists.txt b/CMakeLists.txt index e13a6e962189714c274e86a08edf72afa8714e93..d30eca821513935d7244895f2fdf1b2c33dae08a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,10 +348,10 @@ message (STATUS "VERSION: ${PACKAGE_VERSION}") message (STATUS "BUILD: ${TARANTOOL_BUILD}") message (STATUS "C_COMPILER: ${TARANTOOL_C_COMPILER}") message (STATUS "CXX_COMPILER: ${TARANTOOL_CXX_COMPILER}") -message (STATUS "C_FLAGS:${CMAKE_C_FLAGS} ${TARANTOOL_C_FLAGS}") -message (STATUS "CXX_FLAGS:${CMAKE_CXX_FLAGS} ${TARANTOOL_CXX_FLAGS}") -message (STATUS "OBJC_FLAGS:${CMAKE_C_FLAGS} ${CMAKE_OBJC_FLAGS}") -message (STATUS "OBJCXX_FLAGS:${CMAKE_CXX_FLAGS} ${CMAKE_OBJCXX_FLAGS}") +message (STATUS "C_FLAGS:${TARANTOOL_C_FLAGS}") +message (STATUS "CXX_FLAGS:${TARANTOOL_CXX_FLAGS}") +message (STATUS "OBJC_FLAGS:${TARANTOOL_OBJC_FLAGS}") +message (STATUS "OBJCXX_FLAGS:${TARANTOOL_OBJCXX_FLAGS}") message (STATUS "PREFIX: ${CMAKE_INSTALL_PREFIX}") message (STATUS "MODULES: ${TARANTOOL_MODULES}") message (STATUS "ENABLE_STATIC: ${ENABLE_STATIC}") diff --git a/include/config.h.cmake b/include/config.h.cmake index e782061b1c31fddcd431d5000de8f8aff92b840f..d253758e2ee2bb3a79649f00df2d2b8ac7ab00e4 100644 --- a/include/config.h.cmake +++ b/include/config.h.cmake @@ -107,10 +107,10 @@ #define BUILD_INFO "@TARANTOOL_BUILD@" #define BUILD_OPTIONS "cmake . @TARANTOOL_OPTIONS@" #define COMPILER_INFO "@CMAKE_C_COMPILER@ @CMAKE_CXX_COMPILER@" -#define COMPILER_C_FLAGS "@CMAKE_C_FLAGS@" -#define COMPILER_CXX_FLAGS "@CMAKE_CXX_FLAGS@" -#define COMPILER_OBJC_FLAGS "@CMAKE_C_FLAGS@ @CMAKE_OBJC_FLAGS@" -#define COMPILER_OBJCXX_FLAGS "@CMAKE_CXX_FLAGS@ @CMAKE_OBJCXX_FLAGS@" +#define TARANTOOL_C_FLAGS "@TARANTOOL_C_FLAGS@" +#define TARANTOOL_CXX_FLAGS "@TARANTOOL_CXX_FLAGS@" +#define TARANTOOL_OBJC_FLAGS "@TARANTOOL_OBJC_FLAGS@" +#define TARANTOOL_OBJCXX_FLAGS "@TARANTOOL_OBJCXX_FLAGS@" /* * vim: syntax=c */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6dbba7e4953e31a0ab8f4e86ca6a02da5b6957f0..0d7cbb2845c37cdf24782e539bd7e6d302cd1b6f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -145,6 +145,11 @@ endif() set (common_libraries ${common_libraries} PARENT_SCOPE) add_subdirectory(lib) +# Save CMAKE_XXX_FLAGS from this directory for config.h (used in --version) +set(TARANTOOL_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE) +set(TARANTOOL_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE) +set(TARANTOOL_OBJC_FLAGS ${CMAKE_OBJC_FLAGS} PARENT_SCOPE) +set(TARANTOOL_OBJCXX_FLAGS ${CMAKE_OBJCXX_FLAGS} PARENT_SCOPE) function(tarantool_module mod) set (module_sources ${ARGN}) diff --git a/src/lua/info.m b/src/lua/info.m index e36d4c00c09cee851bd15c19629e0195cc85451e..03bab51ec09f31a2b54f34d947d37ca7eb943d57 100644 --- a/src/lua/info.m +++ b/src/lua/info.m @@ -163,7 +163,7 @@ lbox_info_init_static_values(struct lua_State *L) /* box.info.build.flags */ lua_pushstring(L, "flags"); - lua_pushstring(L, COMPILER_C_FLAGS); + lua_pushstring(L, TARANTOOL_C_FLAGS); lua_settable(L, -3); lua_settable(L, -3); /* box.info.build */ diff --git a/src/tarantool.m b/src/tarantool.m index b21da0efb7d63862a41a69861856f509ca464518..f546436c2597667e8a0b74bdf1a6451122978091 100644 --- a/src/tarantool.m +++ b/src/tarantool.m @@ -684,7 +684,7 @@ main(int argc, char **argv) printf("Target: %s\n", BUILD_INFO); printf("Build options: %s\n", BUILD_OPTIONS); printf("Compiler: %s\n", COMPILER_INFO); - printf("C_FLAGS:%s\n", COMPILER_C_FLAGS); + printf("C_FLAGS:%s\n", TARANTOOL_C_FLAGS); return 0; }