Drop unused boost-thread dependency.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d35376bbfcd2d9dff1773e306d51bfd0d105ce1..d2697fae7c2c6d21a670166a39666283f49a933b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,14 +42,6 @@ if(WIN32)
        # This option is user configurable, but enable it by default on win32.
        set(STATIC_PKGDEPS_LIBS TRUE)
 
-       # For boost-thread we need two additional settings on win32:
-       set(Boost_USE_STATIC_LIBS ON)
-       add_definitions(-DBOOST_THREAD_USE_LIB)
-
-       # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
-       # The library is named libboost_thread_win32* (not libboost_thread*).
-       set(Boost_THREADAPI win32)
-
        # Windows does not support UNIX signals.
        set(ENABLE_SIGNALS FALSE)
 endif()
@@ -102,7 +94,7 @@ else()
        find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-set(BOOSTCOMPS filesystem serialization system thread)
+set(BOOSTCOMPS filesystem serialization system)
 if(ENABLE_TESTS)
        list(APPEND BOOSTCOMPS unit_test_framework)
 endif()
@@ -210,6 +202,7 @@ set(pulseview_SOURCES
        main.cpp
        pv/application.cpp
        pv/devicemanager.cpp
+       pv/globalsettings.cpp
        pv/mainwindow.cpp
        pv/session.cpp
        pv/storesession.cpp
@@ -229,9 +222,9 @@ set(pulseview_SOURCES
        pv/devices/hardwaredevice.cpp
        pv/devices/inputfile.cpp
        pv/devices/sessionfile.cpp
-       pv/dialogs/about.cpp
        pv/dialogs/connect.cpp
        pv/dialogs/inputoutputoptions.cpp
+       pv/dialogs/settings.cpp
        pv/dialogs/storeprogress.cpp
        pv/popups/deviceoptions.cpp
        pv/popups/channels.cpp
@@ -283,14 +276,19 @@ set(pulseview_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
+       pv/globalsettings.hpp
        pv/mainwindow.hpp
        pv/session.hpp
        pv/storesession.hpp
        pv/binding/device.hpp
+       pv/data/analog.hpp
+       pv/data/analogsegment.hpp
+       pv/data/logic.hpp
+       pv/data/logicsegment.hpp
        pv/data/signalbase.hpp
-       pv/dialogs/about.hpp
        pv/dialogs/connect.hpp
        pv/dialogs/inputoutputoptions.hpp
+       pv/dialogs/settings.hpp
        pv/dialogs/storeprogress.hpp
        pv/popups/channels.hpp
        pv/popups/deviceoptions.hpp
@@ -335,10 +333,6 @@ set(pulseview_HEADERS
        pv/widgets/wellarray.hpp
 )
 
-set(pulseview_FORMS
-       pv/dialogs/about.ui
-)
-
 set(pulseview_RESOURCES
        pulseview.qrc
 )
@@ -385,14 +379,12 @@ endif()
 
 if(Qt5Core_FOUND)
        qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
-       qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
        qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()
        # Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
        # https://bugreports.qt.io/browse/QTBUG-22829
        qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
                OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
-       qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
        qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
        include(${QT_USE_FILE})
 endif()
@@ -476,14 +468,12 @@ if(ANDROID)
 add_library(${PROJECT_NAME} SHARED
        ${pulseview_SOURCES}
        ${pulseview_HEADERS_MOC}
-       ${pulseview_FORMS_HEADERS}
        ${pulseview_RESOURCES_RCC}
 )
 else()
 add_executable(${PROJECT_NAME}
        ${pulseview_SOURCES}
        ${pulseview_HEADERS_MOC}
-       ${pulseview_FORMS_HEADERS}
        ${pulseview_RESOURCES_RCC}
 )
 endif()