Merge lp:~mzanetti/ubuntu-clock-app/enable-c++11 into lp:~nik90/ubuntu-clock-app/10-world-clocks

Proposed by Michael Zanetti
Status: Merged
Merged at revision: 35
Proposed branch: lp:~mzanetti/ubuntu-clock-app/enable-c++11
Merge into: lp:~nik90/ubuntu-clock-app/10-world-clocks
Diff against target: 11 lines (+1/-0)
1 file modified
CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~mzanetti/ubuntu-clock-app/enable-c++11
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan Pending
Review via email: mp+226690@code.launchpad.net

Commit message

explicitly enable c++11, be more strict with warnings

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Thnx. That did except for the 1 warning that you mentioned on IRC. I was able to fix that as well :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-07-08 10:52:02 +0000
3+++ CMakeLists.txt 2014-07-14 15:12:21 +0000
4@@ -3,6 +3,7 @@
5
6 set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
7 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
8+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
9
10 find_package(Qt5Core)
11 find_package(Qt5Qml)

Subscribers

People subscribed via source and target branches