projects/aports·blob master · refs

101 lines · 4.8 KiB

1diff --git a/compizconfig/gsettings/mocks/CMakeLists.txt b/compizconfig/gsettings/mocks/CMakeLists.txt
2index 17fe51e..d105bb1 100644
3--- a/compizconfig/gsettings/mocks/CMakeLists.txt
4+++ b/compizconfig/gsettings/mocks/CMakeLists.txt
5@@ -8,7 +8,7 @@ if (GLIB_FOUND)
6 ${CMAKE_CURRENT_SOURCE_DIR}/../gsettings_backend_shared
7 ${GLIB_INCLUDE_DIRS})
8
9- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
10+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
11
12 add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC
13 ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp
14diff --git a/compizconfig/gsettings/tests/CMakeLists.txt b/compizconfig/gsettings/tests/CMakeLists.txt
15index 9a81a5d..2e3bbb0 100644
16--- a/compizconfig/gsettings/tests/CMakeLists.txt
17+++ b/compizconfig/gsettings/tests/CMakeLists.txt
18@@ -16,7 +16,7 @@ pkg_check_modules (COMPIZCONFIG_TEST_GSETTINGS gio-2.0 glib-2.0)
19
20 if (COMPIZCONFIG_TEST_GSETTINGS_FOUND)
21
22- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
23+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
24
25 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
26 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../testenvironments)
27diff --git a/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt b/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt
28index 683c83f..7778503 100644
29--- a/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt
30+++ b/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt
31@@ -11,7 +11,7 @@ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../mocks/libcompizconfig)
32 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
33 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
34
35-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
36+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
37
38 add_executable (compizconfig_test_ccs_gnome_gsettings_integrated_setting
39 ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp)
40diff --git a/compizconfig/integration/gnome/tests/CMakeLists.txt b/compizconfig/integration/gnome/tests/CMakeLists.txt
41index 30fd552..26fdff1 100644
42--- a/compizconfig/integration/gnome/tests/CMakeLists.txt
43+++ b/compizconfig/integration/gnome/tests/CMakeLists.txt
44@@ -8,7 +8,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../gsettings/mocks)
45 include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
46 link_directories (${CMAKE_INSTALL_PREFIX}/lib)
47
48-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
49+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
50
51 add_library (compizconfig_ccs_mock_gnome_integrated_setting_composition
52 ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_gnome_integrated_setting_composition.c)
53diff --git a/compizconfig/libcompizconfig/tests/CMakeLists.txt b/compizconfig/libcompizconfig/tests/CMakeLists.txt
54index a3a42f9..78446f4 100644
55--- a/compizconfig/libcompizconfig/tests/CMakeLists.txt
56+++ b/compizconfig/libcompizconfig/tests/CMakeLists.txt
57@@ -9,7 +9,7 @@ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../mocks/libcompizconfig)
58 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
59 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
60
61-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
62+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
63
64 add_definitions (-DCONFIGDIR="${COMPIZCONFIG_CONFIG_DIR}")
65
66diff --git a/cmake/CompizCommon.cmake b/cmake/CompizCommon.cmake
67index b567cfc..d06e86b 100644
68--- a/cmake/CompizCommon.cmake
69+++ b/cmake/CompizCommon.cmake
70@@ -54,7 +54,7 @@ set (
71
72 # Almost everything is a shared library now, so almost everything needs -fPIC
73 set (COMMON_FLAGS "-fPIC -Wall")
74-set (COMMON_CXX_FLAGS "-std=c++11")
75+set (COMMON_CXX_FLAGS "-std=c++17")
76
77 option (COMPIZ_SUBOBJECT_LINKAGE_WARNINGS "Warn about subobject linkage" OFF)
78 if (NOT COMPIZ_SUBOBJECT_LINKAGE_WARNINGS)
79diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
80index fcf974f..997d050 100644
81--- a/src/CMakeLists.txt
82+++ b/src/CMakeLists.txt
83@@ -16,7 +16,6 @@ add_subdirectory( servergrab )
84 IF (COMPIZ_BUILD_TESTING)
85 add_subdirectory( privatescreen/tests )
86 add_subdirectory( wrapsystem/tests )
87-add_subdirectory( plugin )
88 add_subdirectory( option/tests )
89 add_subdirectory( tests )
90 ENDIF (COMPIZ_BUILD_TESTING)
91diff --git a/tests/acceptance-tests/autopilot/CMakeLists.txt b/tests/acceptance-tests/autopilot/CMakeLists.txt
92index 9999379..d6e1f7c 100644
93--- a/tests/acceptance-tests/autopilot/CMakeLists.txt
94+++ b/tests/acceptance-tests/autopilot/CMakeLists.txt
95@@ -7,6 +7,3 @@ set (COMPIZ_AUTOPILOT_ACCEPTANCE_TEST_LIBRARIES
96
97 target_link_libraries (compiz_autopilot_acceptance_tests
98 ${COMPIZ_AUTOPILOT_ACCEPTANCE_TEST_LIBRARIES})
99-
100-install (TARGETS compiz_autopilot_acceptance_tests
101- RUNTIME DESTINATION ${exec_prefix})