cmake: Add boost-thread as explicit dependency.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cea8b744f7a2e67e132983da357db9366a715f46..a510bd6a2b3c8a39b93d516523e36b60e992ccf4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,11 @@ project(pulseview)
 #-------------------------------------------------------------------------------
 
 option(ENABLE_TESTS "Enable unit tests" FALSE)
-option(STATIC_PKGDEPS_LIBS "Statically link to sigrok libraries" FALSE)
+option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
 if(WIN32)
-       # On Windows/MinGW we need to statically link to libraries
-       # This option is user configurable, but enable it by default on win32
+       # On Windows/MinGW we need to statically link to libraries.
+       # This option is user configurable, but enable it by default on win32.
        set(STATIC_PKGDEPS_LIBS TRUE)
 endif()
 
@@ -46,13 +46,14 @@ pkg_check_modules(PKGDEPS REQUIRED
        libsigrok>=0.2.0
 )
 
+find_package(Qt4 REQUIRED)
+
 # On Windows/MinGW we explicitly point cmake to the Boost directory.
 if(WIN32)
        set(BOOST_ROOT /usr/local)
-endif(WIN32)
+endif()
 
-find_package(Qt4 REQUIRED)
-find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
+find_package(Boost 1.46 COMPONENTS system thread)
 
 #===============================================================================
 #= Config Header
@@ -83,14 +84,16 @@ set(pulseview_SOURCES
        pv/datasnapshot.cpp
        pv/logicdata.cpp
        pv/logicdatasnapshot.cpp
-       pv/logicsignal.cpp
        pv/mainwindow.cpp
        pv/samplingbar.cpp
        pv/signaldata.cpp
        pv/sigsession.cpp
-       pv/signal.cpp
+       pv/view/cursor.cpp
        pv/view/header.cpp
+       pv/view/logicsignal.cpp
        pv/view/ruler.cpp
+       pv/view/signal.cpp
+       pv/view/timemarker.cpp
        pv/view/view.cpp
        pv/view/viewport.cpp
 )
@@ -100,8 +103,10 @@ set(pulseview_HEADERS
        pv/mainwindow.h
        pv/samplingbar.h
        pv/sigsession.h
+       pv/view/cursor.h
        pv/view/header.h
        pv/view/ruler.h
+       pv/view/timemarker.h
        pv/view/view.h
        pv/view/viewport.h
 )
@@ -125,6 +130,7 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
+add_definitions(-Werror -Wall)
 
 #===============================================================================
 #= Global Include Directories