projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| abe20e21 JB |
1 | --- percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake.orig 2015-05-06 12:38:47.000000000 +0200 |
| 2 | +++ percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake 2015-06-09 19:54:42.577790251 +0200 | |
| 7eed3192 | 3 | @@ -37,8 +37,8 @@ |
| abe20e21 JB |
4 | IF(WITH_VALGRIND) |
| 5 | SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") | |
| 6 | ENDIF() | |
| 7 | - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") | |
| 8 | - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") | |
| 9 | + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") | |
| 10 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") | |
| 11 | ENDIF() | |
| 12 | IF(CMAKE_COMPILER_IS_GNUCXX) | |
| 7eed3192 | 13 | # GCC 6 has C++14 as default, set it explicitly to the old default. |
| 75e29e43 | 14 | @@ -52,26 +52,26 @@ IF(UNIX) |
| abe20e21 JB |
15 | IF(WITH_VALGRIND) |
| 16 | SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") | |
| 17 | ENDIF() | |
| 18 | - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") | |
| 19 | - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") | |
| 75e29e43 AM |
20 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") |
| 21 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") | |
| abe20e21 JB |
22 | ENDIF() |
| 23 | ||
| 24 | # Default Clang flags | |
| 25 | IF(CMAKE_C_COMPILER_ID MATCHES "Clang") | |
| 26 | SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") | |
| 27 | - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") | |
| 28 | - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") | |
| 29 | + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") | |
| 75e29e43 | 30 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") |
| abe20e21 JB |
31 | ENDIF() |
| 32 | IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | |
| 33 | SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") | |
| 75e29e43 AM |
34 | IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR |
| 35 | CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) | |
| 36 | IF(CMAKE_SYSTEM_NAME MATCHES "Linux") | |
| 37 | - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03") | |
| 38 | + SET(COMMON_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} -std=gnu++03") | |
| 39 | ENDIF() | |
| 40 | ENDIF() | |
| abe20e21 JB |
41 | - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") |
| 42 | - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") | |
| 43 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") | |
| 75e29e43 | 44 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") |
| abe20e21 JB |
45 | ENDIF() |
| 46 | ||
| 47 | # Solaris flags |