Lower Boost dependency to 1.45, which is sufficient.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1893b6c1c47a90edd29434b7de4f5e236a22889..b2196e4eaba5ce397016f15cc0ad892072f2f98c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ project(pulseview)
 #= User Options
 #-------------------------------------------------------------------------------
 
+option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
@@ -53,7 +54,13 @@ if(WIN32)
        set(BOOST_ROOT /usr/local)
 endif()
 
-find_package(Boost 1.46 COMPONENTS system thread)
+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.45 COMPONENTS system thread_win32)
+else()
+find_package(Boost 1.45 COMPONENTS system thread)
+endif()
 
 #===============================================================================
 #= Config Header
@@ -80,16 +87,21 @@ configure_file (
 
 set(pulseview_SOURCES
        main.cpp
-       pv/analogdata.cpp
-       pv/analogdatasnapshot.cpp
-       pv/datasnapshot.cpp
-       pv/logicdata.cpp
-       pv/logicdatasnapshot.cpp
        pv/mainwindow.cpp
        pv/samplingbar.cpp
-       pv/signaldata.cpp
        pv/sigsession.cpp
+       pv/data/analog.cpp
+       pv/data/analogsnapshot.cpp
+       pv/data/logic.cpp
+       pv/data/logicsnapshot.cpp
+       pv/data/signaldata.cpp
+       pv/data/snapshot.cpp
        pv/dialogs/about.cpp
+       pv/dialogs/hwcap.cpp
+       pv/prop/enum.cpp
+       pv/prop/property.cpp
+       pv/prop/binding/binding.cpp
+       pv/prop/binding/hwcap.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
        pv/view/header.cpp
@@ -133,7 +145,11 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
-add_definitions(-Werror -Wall)
+add_definitions(-Wextra)
+
+if(NOT DISABLE_WERROR)
+       add_definitions(-Werror)
+endif()
 
 #===============================================================================
 #= Global Include Directories