Compiz

Merge lp:~azzar1/compiz/c++11 into lp:compiz/0.9.12

  1. c++11
  2. Merge into 0.9.12
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 3963
Merged at revision: 3973
Proposed branch: lp:~azzar1/compiz/c++11
Merge into: lp:compiz/0.9.12
Prerequisite: lp:~azzar1/compiz/cmake-3.0
Diff against target: 102 lines (+8/-8)
8 files modified
cmake/CompizCommon.cmake (+1/-1)
compizconfig/gsettings/mocks/CMakeLists.txt (+1/-1)
compizconfig/gsettings/tests/CMakeLists.txt (+1/-1)
compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt (+1/-1)
compizconfig/integration/gnome/tests/CMakeLists.txt (+1/-1)
compizconfig/integration/mate/gsettings/tests/CMakeLists.txt (+1/-1)
compizconfig/integration/mate/tests/CMakeLists.txt (+1/-1)
compizconfig/libcompizconfig/tests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~azzar1/compiz/c++11
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+266579@code.launchpad.net

Commit message

Build compiz using c++11.

Description of the change

Build compiz using c++11.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3963
http://jenkins.qa.ubuntu.com/job/compiz-ci/74/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/74/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizCommon.cmake'
2--- cmake/CompizCommon.cmake 2015-07-31 14:49:53 +0000
3+++ cmake/CompizCommon.cmake 2015-07-31 14:49:53 +0000
4@@ -84,7 +84,7 @@
5 endif ()
6
7 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
8-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
9+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -std=c++11")
10
11 set (COMMON_LINKER_FLAGS "-Wl,-zdefs")
12 set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
13
14=== modified file 'compizconfig/gsettings/mocks/CMakeLists.txt'
15--- compizconfig/gsettings/mocks/CMakeLists.txt 2012-10-08 13:50:56 +0000
16+++ compizconfig/gsettings/mocks/CMakeLists.txt 2015-07-31 14:49:53 +0000
17@@ -8,7 +8,7 @@
18 ${CMAKE_CURRENT_SOURCE_DIR}/../gsettings_backend_shared
19 ${GLIB_INCLUDE_DIRS})
20
21- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
22+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
23
24 add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC
25 ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp
26
27=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
28--- compizconfig/gsettings/tests/CMakeLists.txt 2013-07-17 06:06:08 +0000
29+++ compizconfig/gsettings/tests/CMakeLists.txt 2015-07-31 14:49:53 +0000
30@@ -17,7 +17,7 @@
31
32 if (COMPIZCONFIG_TEST_GSETTINGS_FOUND)
33
34- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
35+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
36
37 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
38 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../testenvironments)
39
40=== modified file 'compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt'
41--- compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt 2013-05-13 13:41:19 +0000
42+++ compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt 2015-07-31 14:49:53 +0000
43@@ -11,7 +11,7 @@
44 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
45 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
46
47-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
48+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
49
50 add_executable (compizconfig_test_ccs_gnome_gsettings_integrated_setting
51 ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp)
52
53=== modified file 'compizconfig/integration/gnome/tests/CMakeLists.txt'
54--- compizconfig/integration/gnome/tests/CMakeLists.txt 2013-05-13 13:42:28 +0000
55+++ compizconfig/integration/gnome/tests/CMakeLists.txt 2015-07-31 14:49:53 +0000
56@@ -8,7 +8,7 @@
57 include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
58 link_directories (${CMAKE_INSTALL_PREFIX}/lib)
59
60-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
61+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
62
63 add_library (compizconfig_ccs_mock_gnome_integrated_setting_composition
64 ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_gnome_integrated_setting_composition.c)
65
66=== modified file 'compizconfig/integration/mate/gsettings/tests/CMakeLists.txt'
67--- compizconfig/integration/mate/gsettings/tests/CMakeLists.txt 2015-02-04 22:20:18 +0000
68+++ compizconfig/integration/mate/gsettings/tests/CMakeLists.txt 2015-07-31 14:49:53 +0000
69@@ -11,7 +11,7 @@
70 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
71 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
72
73-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
74+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
75
76 add_executable (compizconfig_test_ccs_mate_gsettings_integrated_setting
77 ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp)
78
79=== modified file 'compizconfig/integration/mate/tests/CMakeLists.txt'
80--- compizconfig/integration/mate/tests/CMakeLists.txt 2015-02-04 22:20:18 +0000
81+++ compizconfig/integration/mate/tests/CMakeLists.txt 2015-07-31 14:49:53 +0000
82@@ -8,7 +8,7 @@
83 include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
84 link_directories (${CMAKE_INSTALL_PREFIX}/lib)
85
86-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
87+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
88
89 add_library (compizconfig_ccs_mock_mate_integrated_setting_composition
90 ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_mate_integrated_setting_composition.c)
91
92=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
93--- compizconfig/libcompizconfig/tests/CMakeLists.txt 2013-07-17 06:06:08 +0000
94+++ compizconfig/libcompizconfig/tests/CMakeLists.txt 2015-07-31 14:49:53 +0000
95@@ -9,7 +9,7 @@
96 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
97 link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
98
99-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
100+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
101
102 add_definitions (-DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\")
103

Subscribers

People subscribed via source and target branches