diff --git a/CMakeLists.txt b/CMakeLists.txt index d8c9c4ab4a00071c3645bb76497613b94cc89db0..a8b0793a24ea9b9944e58e57f6ba8513b2d8b3a8 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:${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 "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 93d8d0f916593feec6921cadc7a162dbb07aa6da..397b9f5a790eeef3396fbb85285d8b168422b25a 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 "@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@" +#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 b2dc87bcac282122fda8eac25d8b9ba7eec45e00..8fa013a9210013b9ec7b3e24499826131d632650 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -144,10 +144,10 @@ 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) +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 ea54b0dac6d27f1b0293024b4f6e1f5ef6999a57..24a00facd036ad05c86f576763ea8554ab3bf22a 100644 --- a/src/tarantool.m +++ b/src/tarantool.m @@ -685,7 +685,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; }