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

[Albert Astals Cid]

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)]

+1

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Confirming working at https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/1985/+packages

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-16 08:24:29 +0000
+++ CMakeLists.txt	2017-01-04 09:16:00 +0000
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.1)
 
 project(qtmir)
 
@@ -27,9 +27,11 @@
 set(CMAKE_AUTOMOC ON)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra -Werror")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC -Wall -fno-strict-aliasing -Werror -Wextra")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -fno-strict-aliasing -Werror -Wextra")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 
+set (CMAKE_CXX_STANDARD 14)
+
 if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
     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")
 endif()