X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=8566adf04a8509294c0625f6f9521c4f76da8970;hp=8dd7c259bd80475cfa07f1e981b2c2f86a94fc31;hb=d52d8455db515a779b4451c223ba7aaded70951a;hpb=3820592a018c777727a6e65bd754d113742f4462

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dd7c259..8566adf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ project(pulseview)
 #-------------------------------------------------------------------------------
 
 option(DISABLE_WERROR "Build without -Werror" FALSE)
+option(ENABLE_SIGROKDECODE "Build with libsigrokdecode" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
@@ -45,12 +46,17 @@ endif()
 #= Dependencies
 #-------------------------------------------------------------------------------
 
-find_package(PkgConfig)
-pkg_check_modules(PKGDEPS REQUIRED
-	libsigrokdecode>=0.1.0
+list(APPEND PKGDEPS
 	libsigrok>=0.2.0
 )
 
+if(ENABLE_SIGROKDECODE)
+	list(APPEND PKGDEPS libsigrokdecode>=0.1.0)
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
+
 find_package(Qt4 REQUIRED)
 
 # Find the platform's thread library (needed for boost-thread).
@@ -60,9 +66,9 @@ find_package(Threads)
 if(WIN32)
 # On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'.
 # The library is named libboost_thread_win32* (not libboost_thread*).
-find_package(Boost 1.42 COMPONENTS system thread_win32)
+find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED)
 else()
-find_package(Boost 1.42 COMPONENTS system thread)
+find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
 endif()
 
 #===============================================================================
@@ -90,8 +96,8 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
+	signalhandler.cpp
 	pv/mainwindow.cpp
-	pv/samplingbar.cpp
 	pv/sigsession.cpp
 	pv/data/analog.cpp
 	pv/data/analogsnapshot.cpp
@@ -100,11 +106,16 @@ set(pulseview_SOURCES
 	pv/data/signaldata.cpp
 	pv/data/snapshot.cpp
 	pv/dialogs/about.cpp
-	pv/dialogs/hwcap.cpp
+	pv/dialogs/connect.cpp
+	pv/dialogs/deviceoptions.cpp
+	pv/prop/bool.cpp
+	pv/prop/double.cpp
 	pv/prop/enum.cpp
+	pv/prop/int.cpp
 	pv/prop/property.cpp
 	pv/prop/binding/binding.cpp
 	pv/prop/binding/deviceoptions.cpp
+	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
 	pv/view/header.cpp
@@ -117,10 +128,13 @@ set(pulseview_SOURCES
 )
 
 set(pulseview_HEADERS
+	signalhandler.h
 	pv/mainwindow.h
-	pv/samplingbar.h
 	pv/sigsession.h
 	pv/dialogs/about.h
+	pv/dialogs/connect.h
+	pv/dialogs/deviceoptions.h
+	pv/toolbars/samplingbar.h
 	pv/view/cursor.h
 	pv/view/header.h
 	pv/view/ruler.h
@@ -148,7 +162,11 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
-add_definitions(-Wextra)
+add_definitions(-Wall -Wextra)
+
+if(ENABLE_SIGROKDECODE)
+	add_definitions(-DENABLE_SIGROKDECODE)
+endif()
 
 if(NOT DISABLE_WERROR)
 	add_definitions(-Werror)