]>
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 | |
3 | @@ -30,8 +30,8 @@ | |
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) | |
13 | SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") | |
14 | @@ -39,20 +39,20 @@ | |
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}") | |
20 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") | |
21 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") | |
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}") | |
30 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") | |
31 | ENDIF() | |
32 | IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | |
33 | SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") | |
34 | - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") | |
35 | - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") | |
36 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") | |
37 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") | |
38 | ENDIF() | |
39 | ||
40 | # Solaris flags | |
d582d06a JB |
41 | --- mysql-5.7.23/cmake/build_configurations/compiler_options.cmake.orig 2018-10-13 21:39:26.928696351 +0200 |
42 | +++ mysql-5.7.23/cmake/build_configurations/compiler_options.cmake 2018-10-13 22:14:21.388672435 +0200 | |
43 | @@ -59,7 +59,7 @@ | |
44 | EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion | |
45 | OUTPUT_VARIABLE GXX_VERSION) | |
46 | IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0) | |
47 | - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03") | |
48 | + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11") | |
49 | ENDIF() | |
50 | # Disable inline optimizations for valgrind testing to avoid false positives | |
51 | IF(WITH_VALGRIND) |