diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-07-02 13:28:17 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-07-02 13:28:17 +0100 |
| commit | 38954b526bf77a4324ee3129bdcbe0fcfa01df3e (patch) | |
| tree | 93849e51199531d9989f1b807c416d8e5c069e94 /cmake/build_configurations | |
| parent | 4c626c0588545a985f67867345a1996e4925867f (diff) | |
| download | mariadb-git-38954b526bf77a4324ee3129bdcbe0fcfa01df3e.tar.gz | |
Don't cache {C,CXX} flags, this file is parsed twice, the first time
CMAKE_SIZEOF_VOID_P is unset so the variables are set incorrectly.
Diffstat (limited to 'cmake/build_configurations')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index a3b1515ef31..88caf04d4c9 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -204,19 +204,13 @@ IF(UNIX) ENDIF() ENDIF() - SET(CMAKE_CXX_FLAGS_RELEASE "${OPT_FLG} ${COMMON_CXXFLAGS}" - CACHE STRING "Release type C++ compiler flags") - SET(CMAKE_C_FLAGS_RELEASE "${OPT_FLG} ${COMMON_CFLAGS}" - CACHE STRING "Release type C compile flags") - - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CXXFLAGS}" - CACHE STRING "Default/RelWithDebInfo type C++ compiler flags") - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CFLAGS}" - CACHE STRING "Default/RelWithDebInfo type C compiler flags") - - SET(CMAKE_CXX_FLAGS_DEBUG "${DBG_FLG} ${COMMON_CXXFLAGS}" - CACHE STRING "Debug type C++ compiler flags") - SET(CMAKE_C_FLAGS_DEBUG "${DBG_FLG} ${COMMON_CFLAGS}" - CACHE STRING "Debug type C compiler flags") + SET(CMAKE_CXX_FLAGS_RELEASE "${OPT_FLG} ${COMMON_CXXFLAGS}") + SET(CMAKE_C_FLAGS_RELEASE "${OPT_FLG} ${COMMON_CFLAGS}") + + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CXXFLAGS}") + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CFLAGS}") + + SET(CMAKE_CXX_FLAGS_DEBUG "${DBG_FLG} ${COMMON_CXXFLAGS}") + SET(CMAKE_C_FLAGS_DEBUG "${DBG_FLG} ${COMMON_CFLAGS}") ENDIF() |