Merge lp:~dobey/unity-scope-click/explicit-pthread into lp:unity-scope-click

[dobey]

New libstdc++ requires explicit -lpthread when using std::thread.

[lp:~dobey/unity-scope-click/explicit-pthread]

266. By dobey on 2014-08-15

Use the cmake thread libs variable instead.

[Alejandro J. Cura (alecu)]

Code looks good, have not tested it.

review: Approve

[lp:~dobey/unity-scope-click/explicit-pthread]

267. By dobey on 2014-08-15

Also need the find_package(Threads) in the init-departments CMakeLists.txt.

[Adam Conrad (adconrad)]

Tested r267, and it does the right thing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:265
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/516/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2826/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/56/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3110/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/516/rebuild

review: Approve (continuous-integration)

=== modified file 'tools/init-departments/CMakeLists.txt'
--- tools/init-departments/CMakeLists.txt	2014-07-14 09:43:27 +0000
+++ tools/init-departments/CMakeLists.txt	2014-08-15 14:03:54 +0000
@@ -2,6 +2,7 @@
 set (INITDEPTS init-departments)
 
 find_package (Qt5Core REQUIRED)
+find_package (Threads)
 
 include_directories (
     ${CMAKE_SOURCE_DIR}/libclickscope
@@ -15,7 +16,8 @@
 qt5_use_modules (${INITDEPTS} Network Sql)
 
 target_link_libraries(${INITDEPTS}
-        ${SCOPE_LIB_NAME}
-    )
+  ${SCOPE_LIB_NAME}
+  ${CMAKE_THREAD_LIBS_INIT}
+)
 
 install(TARGETS ${INITDEPTS} DESTINATION sbin)