From 2b21545845221a841c11db2c3b4782f6893e72d7 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 15 Mar 2016 19:25:33 -0500
Subject: use cmake's find_package(Threads) output everywhere instead of just
 in src/

---
 CMakeLists.txt                   | 8 ++++++++
 src/CMakeLists.txt               | 8 +-------
 tests/integration/CMakeLists.txt | 2 +-
 tests/unit/CMakeLists.txt        | 4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3230a2b..9302542 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,18 @@ set(CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_P
 ##  Check for prerequisites
 ##
 
+# threads...
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.1)
+    set(THREAD_LINK_LIBRARIES -pthread)
+else()
+    set(THREAD_LINK_LIBRARIES Threads::Threads) # introduced in cmake 3.1
+endif()
+
 find_package(PkgConfig REQUIRED)
 
+# glib...
 set(GLIB_MINIMUM 2.36)
 pkg_check_modules(SERVICE_DEPS REQUIRED
     gio-unix-2.0>=${GLIB_MINIMUM}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4fe7b1a..63c236d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,16 +22,10 @@ add_executable(
     main.cpp
 )
 
-if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.2)
-    set(SERVICE_THREAD_LIBS -pthread)
-else()
-    set(SERVICE_THREAD_LIBS Threads::Threads)
-endif()
-
 target_link_libraries(${SERVICE_EXEC}
     ${SERVICE_LIB}
     ${SERVICE_DEPS_LIBRARIES}
-    ${SERVICE_THREAD_LIBS}
+    ${THREAD_LINK_LIBRARIES}
     ${GCOV_LIBS}
 )
 
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
index 1eb7b3e..9ec6688 100644
--- a/tests/integration/CMakeLists.txt
+++ b/tests/integration/CMakeLists.txt
@@ -19,6 +19,6 @@ function(add_qt_test_by_name name)
   add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
   add_test(${TEST_NAME} ${TEST_NAME})
   set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
-  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES})
+  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
 endfunction()
 add_qt_test_by_name(usb-manager-test)
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 26f2cfb..fe70461 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -19,7 +19,7 @@ function(add_test_by_name name)
   add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
   add_test(${TEST_NAME} ${TEST_NAME})
   set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
-  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES})
+  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
 endfunction()
 add_test_by_name(adbd-client-test)
 add_test_by_name(rotation-lock-test)
@@ -29,6 +29,6 @@ function(add_qt_test_by_name name)
   add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
   add_test(${TEST_NAME} ${TEST_NAME})
   set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
-  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES})
+  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
 endfunction()
 add_qt_test_by_name(usb-snap-test)
-- 
cgit v1.2.3