summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@sun.com>2010-01-14 00:35:07 +0000
committerVladislav Vaintroub <wlad@sun.com>2010-01-14 00:35:07 +0000
commit0c4446c617e7aea275e5ddefbb1658ae4fe7b8a0 (patch)
treef8a972294db3f2f3096dc8489c5848e4f8e0cddf /scripts
parent59e6fa7db17c96bde55a0673d2531f4dabea04e8 (diff)
downloadmariadb-git-0c4446c617e7aea275e5ddefbb1658ae4fe7b8a0.tar.gz
Fix CFLAGS passed to mysql_config, in case makefile generator is Makefile based
Diffstat (limited to 'scripts')
-rw-r--r--scripts/install_scripts.cmake.in12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/install_scripts.cmake.in b/scripts/install_scripts.cmake.in
index f2f64351469..5a590d15b74 100644
--- a/scripts/install_scripts.cmake.in
+++ b/scripts/install_scripts.cmake.in
@@ -2,8 +2,16 @@ SET(CMAKE_SYSTEM_NAME @CMAKE_SYSTEM_NAME@)
SET(UNIX @UNIX@)
SET(WIN32 @WIN32@)
SET(MSVC @MSVC@)
-SET(CFLAGS "@CMAKE_C_FLAGS_RELWITHDEBINFO@")
-SET(CXXFLAGS "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
+SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+IF(CMAKE_GENERATOR MATCHES "Makefiles")
+ # No multiconfig build - use CMAKE_C_FLAGS
+ SET(CFLAGS "@CMAKE_C_FLAGS@")
+ SET(CXXFLAGS "@CMAKE_CXX_FLAGS@")
+ELSE()
+ # Multiconfig build - use CMAKE_C_FLAGS_RELWITHDEBINFO
+ SET(CFLAGS "@CMAKE_C_FLAGS_RELWITHDEBINFO@")
+ SET(CXXFLAGS "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
+ENDIF()
SET(LDFLAGS "@CMAKE_SHARED_LIBRARY_LINK_FLAGS@")
SET(mysqlclient_LIB_DEPENDS "@mysqlclient_LIB_DEPENDS@")
SET(mysqlserver_LIB_DEPENDS "@mysqlserver_LIB_DEPENDS@")