Fix the C++11 thread linking issues for unit tests as well.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c1faddc10c9a0f5d8210fec5f571caa9e5b79b0..f334f9118c024018179cd8fb433d2525790cce39 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,6 +92,10 @@ endif()
 
 find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
 
+# Find the platform's thread library (needed for C++11 threads).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads REQUIRED)
+
 #===============================================================================
 #= System Introspection
 #-------------------------------------------------------------------------------
@@ -124,6 +128,7 @@ configure_file (
 
 set(pulseview_SOURCES
        main.cpp
+       pv/application.cpp
        pv/devicemanager.cpp
        pv/mainwindow.cpp
        pv/sigsession.cpp
@@ -143,7 +148,7 @@ set(pulseview_SOURCES
        pv/dialogs/connect.cpp
        pv/dialogs/storeprogress.cpp
        pv/popups/deviceoptions.cpp
-       pv/popups/probes.cpp
+       pv/popups/channels.cpp
        pv/prop/bool.cpp
        pv/prop/double.cpp
        pv/prop/enum.cpp
@@ -185,7 +190,7 @@ set(pulseview_HEADERS
        pv/dialogs/about.h
        pv/dialogs/connect.h
        pv/dialogs/storeprogress.h
-       pv/popups/probes.h
+       pv/popups/channels.h
        pv/popups/deviceoptions.h
        pv/prop/bool.h
        pv/prop/double.h
@@ -317,6 +322,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
        ${QT_LIBRARIES}
+       ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)