diff --git a/CMakeLists.txt b/CMakeLists.txt index 55774f891b0a575670b077c00ebb176b6bc718c3..d8c9c4ab4a00071c3645bb76497613b94cc89db0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,10 +345,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:${CONFIG_C_FLAGS}") +message (STATUS "CXX_FLAGS:${CONFIG_CXX_FLAGS}") +message (STATUS "OBJC_FLAGS:${CONFIG_C_FLAGS} ${CONFIG_OBJC_FLAGS}") +message (STATUS "OBJCXX_FLAGS:${CONFIG_CXX_FLAGS} ${CONFIG_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 407b4d8fc7a542980df123b1e5516b90af9725d0..93d8d0f916593feec6921cadc7a162dbb07aa6da 100644 --- a/include/config.h.cmake +++ b/include/config.h.cmake @@ -93,10 +93,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 COMPILER_C_FLAGS "@CONFIG_C_FLAGS@" +#define COMPILER_CXX_FLAGS "@CONFIG_CXX_FLAGS@" +#define COMPILER_OBJC_FLAGS "@CONFIG_C_FLAGS@ @CONFIG_OBJC_FLAGS@" +#define COMPILER_OBJCXX_FLAGS "@CONFIG_CXX_FLAGS@ @CONFIG_OBJCXX_FLAGS@" /* * vim: syntax=c */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d4dbfa486100af95f324917bda3e0c979bbab80d..b2dc87bcac282122fda8eac25d8b9ba7eec45e00 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,6 +143,12 @@ endif() set (common_libraries ${common_libraries} PARENT_SCOPE) +# Save CMAKE_XXX_FLAGS from this directory for config.h (used in --version) +set(CONFIG_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE) +set(CONFIG_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE) +set(CONFIG_OBJC_FLAGS ${CMAKE_OBJC_FLAGS} PARENT_SCOPE) +set(CONFIG_OBJCXX_FLAGS ${CMAKE_OBJCXX_FLAGS} PARENT_SCOPE) + function(tarantool_module mod) set (module_sources ${ARGN}) set(cfg_c_flags "-Wno-unused -Wno-unused-parameter")