QtMir

Merge lp:~aacid/qtmir/better_c++14_cmake into lp:qtmir

Proposed by Albert Astals Cid on 2017-01-04

Status:

Merged

Approved by:

Gerry Boland on 2017-01-04

Approved revision:

582

Merged at revision:

582

Proposed branch:

Merge into:

Diff against target:

1 file modified

CMakeLists.txt (+4/-2)

To merge this branch:

bzr merge lp:~aacid/qtmir/better_c++14_cmake

Critical

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Timo Jyrinki (community)		Approve on 2017-01-04
Gerry Boland	2017-01-04	Approve on 2017-01-04
Review via email: mp+314052@code.launchpad.net

Specify C++14 in a more CMake-ish way

Works better when building with Qt 5.7 otherwise one would say C++14, the other C++11 and things would not work out

Gerry Boland (gerboland) wrote on 2017-01-04:

review: Approve

Timo Jyrinki (timo-jyrinki) wrote on 2017-01-04:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'CMakeLists.txt'
2	--- CMakeLists.txt 2016-12-16 08:24:29 +0000
3	+++ CMakeLists.txt 2017-01-04 09:16:00 +0000
4	@@ -1,4 +1,4 @@
5	-cmake_minimum_required(VERSION 2.8.9)
6	+cmake_minimum_required(VERSION 3.1)
7
8	project(qtmir)
9
10	@@ -27,9 +27,11 @@
11	set(CMAKE_AUTOMOC ON)
12
13	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra -Werror")
14	-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC -Wall -fno-strict-aliasing -Werror -Wextra")
15	+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -fno-strict-aliasing -Werror -Wextra")
16	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
17
18	+set (CMAKE_CXX_STANDARD 14)
19	+
20	if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
21	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-mismatched-tags -Wno-inconsistent-missing-override -Wno-implicit-exception-spec-mismatch -Wno-unknown-pragmas")
22	endif()