X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=27859b3ad0674bcf48dbe16203229391dad0b82e;hb=2b76309a072d2493ee1b5293955b72abfd84b8be;hp=069ccd898b8be8501434840c16db3c28325b1750;hpb=aff5174622cf79c6d42c0adbcb9ddbafdf1b96d1;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 069ccd8..27859b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,6 +92,8 @@ endif()
 
 find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
 
+find_package(Threads REQUIRED)
+
 #===============================================================================
 #= System Introspection
 #-------------------------------------------------------------------------------
@@ -124,6 +126,7 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
+	pv/application.cpp
 	pv/devicemanager.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
@@ -138,13 +141,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 +188,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
@@ -275,7 +277,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)
@@ -318,6 +320,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
 	${QT_LIBRARIES}
+	${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)