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 733bfe1f114865e7bac88851130b1b312c69e014..f334f9118c024018179cd8fb433d2525790cce39 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,10 @@ if(ENABLE_DECODE)
        list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
 endif()
 
+if(ANDROID)
+       list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0)
+endif()
+
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
@@ -88,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
 #-------------------------------------------------------------------------------
@@ -120,6 +128,7 @@ configure_file (
 
 set(pulseview_SOURCES
        main.cpp
+       pv/application.cpp
        pv/devicemanager.cpp
        pv/mainwindow.cpp
        pv/sigsession.cpp
@@ -134,13 +143,12 @@ set(pulseview_SOURCES
        pv/device/device.cpp
        pv/device/file.cpp
        pv/device/devinst.cpp
-       pv/device/inputfile.cpp
        pv/device/sessionfile.cpp
        pv/dialogs/about.cpp
        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
@@ -182,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
@@ -243,12 +251,6 @@ if(ENABLE_DECODE)
                pv/widgets/decodergroupbox.h
                pv/widgets/decodermenu.h
        )
-
-       if(ANDROID)
-               list(APPEND pulseview_SOURCES
-                           android/envsetup.cpp
-               )
-       endif()
 endif()
 
 if(WIN32)
@@ -277,7 +279,7 @@ endif()
 #= Global Definitions
 #-------------------------------------------------------------------------------
 
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
@@ -320,6 +322,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
        ${QT_LIBRARIES}
+       ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)