1 --- percona-server-5.7.25-28/cmake/build_configurations/compiler_options.cmake.orig 2019-02-18 07:11:31.000000000 +0100
2 +++ percona-server-5.7.25-28/cmake/build_configurations/compiler_options.cmake 2019-02-28 06:43:42.913206001 +0100
3 @@ -25,17 +25,17 @@ IF(SIZEOF_VOIDP EQUAL 8)
7 -SET(CMAKE_CXX_STANDARD 98)
8 +SET(CMAKE_CXX_STANDARD 11)
12 - MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++03" GNU03_SUPPORTED)
13 + MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++11" GNU11_SUPPORTED)
17 IF(CMAKE_VERSION VERSION_LESS 3.1.0)
18 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++03")
19 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
21 - SET(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -std=gnu++03)
22 + SET(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -std=gnu++11)
26 @@ -61,8 +61,8 @@ IF(UNIX)
27 IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
28 SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
30 - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
31 - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
32 + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
33 + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
35 IF(CMAKE_COMPILER_IS_GNUCXX)
36 SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
37 @@ -95,8 +95,8 @@ IF(UNIX)
39 IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
40 SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
41 - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
42 - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
43 + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
44 + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
46 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
47 SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
48 @@ -146,10 +146,10 @@ IF(UNIX)
50 SET(COMMON_C_FLAGS "-g ${SUNPRO_FLAGS}")
51 SET(COMMON_CXX_FLAGS "-g0 ${SUNPRO_FLAGS}")
52 - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=c++03")
53 - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
54 + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=c++11")
55 + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
56 SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
57 - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}")
58 + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
59 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")