From b79a1119f7a6e845025d0aef8c3c730f9e12cb28 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Wed, 6 Feb 2013 16:29:51 +0400
Subject: [PATCH] Printing compile flags: review comments.
---
CMakeLists.txt | 8 ++++----
include/config.h.cmake | 8 ++++----
src/CMakeLists.txt | 8 ++++----
src/lua/info.m | 2 +-
src/tarantool.m | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8c9c4ab4a..a8b0793a24 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 93d8d0f916..397b9f5a79 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 b2dc87bcac..8fa013a921 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 e36d4c00c0..03bab51ec0 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 ea54b0dac6..24a00facd0 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;
}
--
GitLab