Merge lp:~pete-woods/indicator-network/fix-cpp14-ftbfs into lp:indicator-network

[Pete Woods]

Use modern CMake syntax for setting compiler type to fix FTBFS

Use modern CMake syntax for setting compiler type to fix FTBFS

[dobey (dobey)]

One in-line and can you also do --fixes=lp:1656043 to get the bug linked?

review: Needs Fixing

[dobey (dobey)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-12 11:57:52 +0000
+++ CMakeLists.txt	2017-01-12 22:00:52 +0000
@@ -1,5 +1,5 @@
 project(indicator-network C CXX)
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.1)
 
 string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type_lower)
 
@@ -83,17 +83,22 @@
 pkg_check_modules(URL_DISPATCHER REQUIRED url-dispatcher-1)
 include_directories(${URL_DISPATCHER_INCLUDE_DIRS})
 
+find_package(Threads REQUIRED)
+include_directories(${Thread_INCLUDE_DIRS})
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include_directories(${CMAKE_BINARY_DIR})
 
-set(COMMON_FLAGS "-Wall -Wextra -Wpedantic -fno-permissive -fPIC -fvisibility=hidden -pthread")
+set(COMMON_FLAGS "-Wall -Wextra -Wpedantic -fno-permissive -fPIC -fvisibility=hidden")
 
-# "nice bug" in cmake... http://www.cmake.org/Bug/view.php?id=15058
-# let's not set C_FLAGS as it will break pthreads detection \o/
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${COMMON_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 ${COMMON_FLAGS} -fno-strict-aliasing -fvisibility-inlines-hidden")
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
+if(CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
+endif()
 
 configure_file(
   "config.h.in"
 
=== modified file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt	2016-10-29 20:09:30 +0000
+++ src/util/CMakeLists.txt	2017-01-12 22:00:52 +0000
@@ -9,4 +9,5 @@
 target_link_libraries(
     util
     qdbus-stubs
+    ${CMAKE_THREAD_LIBS_INIT}
 )