mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
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.
This commit is contained in:
parent
4c626c0588
commit
38954b526b
1 changed files with 6 additions and 12 deletions
|
@ -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_RELEASE "${OPT_FLG} ${COMMON_CXXFLAGS}")
|
||||
SET(CMAKE_C_FLAGS_RELEASE "${OPT_FLG} ${COMMON_CFLAGS}")
|
||||
|
||||
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_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CXXFLAGS}")
|
||||
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CFLAGS}")
|
||||
|
||||
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_DEBUG "${DBG_FLG} ${COMMON_CXXFLAGS}")
|
||||
SET(CMAKE_C_FLAGS_DEBUG "${DBG_FLG} ${COMMON_CFLAGS}")
|
||||
|
||||
ENDIF()
|
||||
|
|
Loading…
Reference in a new issue