X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=f334f9118c024018179cd8fb433d2525790cce39;hp=a8cd6c7bfec8aaf7ab60a0d9b69d30ec598e3091;hb=858ae630aec11f2f1300897cc3ca127a4537e598;hpb=e9213170687cf4afd14e20acdc690ff9381d94ae diff --git a/CMakeLists.txt b/CMakeLists.txt index a8cd6c7b..f334f911 100644 --- 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 @@ -138,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 @@ -186,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 @@ -318,6 +322,7 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} ${QT_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ) if(STATIC_PKGDEPS_LIBS)