Merge lp:~agateau/libdbusmenu-qt/build-with-clang into lp:libdbusmenu-qt

Proposed by Aurélien Gâteau on 2014-06-18
Status: Merged
Approved by: Albert Astals Cid on 2014-06-18
Approved revision: 265
Merged at revision: 265
Proposed branch: lp:~agateau/libdbusmenu-qt/build-with-clang
Merge into: lp:libdbusmenu-qt
Diff against target: 15 lines (+5/-0)
1 file modified
src/CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~agateau/libdbusmenu-qt/build-with-clang
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2014-06-18 Approve on 2014-06-18
Review via email: mp+223507@code.launchpad.net

Commit message

Fix build with Clang

To post a comment you must log in.
Albert Astals Cid (aacid) wrote :

Looks good and fixes the thing for me too.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2013-10-28 16:23:30 +0000
+++ src/CMakeLists.txt 2014-06-18 07:31:51 +0000
@@ -17,6 +17,11 @@
17 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")17 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
18endif (__DBUSMENU_HAVE_W_ALL)18endif (__DBUSMENU_HAVE_W_ALL)
1919
20check_cxx_compiler_flag(-std=c++11 __DBUSMENU_HAVE_CXX11)
21if (__DBUSMENU_HAVE_CXX11)
22 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
23endif (__DBUSMENU_HAVE_CXX11)
24
20# Check whether QIcon::name() exists. It was added in late Qt 4.7 cycle, and is25# Check whether QIcon::name() exists. It was added in late Qt 4.7 cycle, and is
21# not present in betas.26# not present in betas.
22set(CMAKE_REQUIRED_INCLUDES "${QT_INCLUDE_DIR}")27set(CMAKE_REQUIRED_INCLUDES "${QT_INCLUDE_DIR}")

Subscribers

People subscribed via source and target branches