Call sr_session_destroy after loading the SigSession, rather than sr_session_stop

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8566adf04a8509294c0625f6f9521c4f76da8970..7bc13e05da62379b2c6e82497b60efbe198048fe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ project(pulseview)
 #-------------------------------------------------------------------------------
 
 option(DISABLE_WERROR "Build without -Werror" FALSE)
+option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_SIGROKDECODE "Build with libsigrokdecode" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
@@ -40,6 +41,9 @@ if(WIN32)
        # For boost-thread we need two additional settings on win32:
        set(Boost_USE_STATIC_LIBS on)
        add_definitions(-DBOOST_THREAD_USE_LIB)
+
+       # Windsws does not support UNIX signals
+       set(ENABLE_SIGNALS FALSE)
 endif()
 
 #===============================================================================
@@ -96,7 +100,6 @@ configure_file (
 
 set(pulseview_SOURCES
        main.cpp
-       signalhandler.cpp
        pv/mainwindow.cpp
        pv/sigsession.cpp
        pv/data/analog.cpp
@@ -118,6 +121,7 @@ set(pulseview_SOURCES
        pv/toolbars/samplingbar.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
+       pv/view/cursorpair.cpp
        pv/view/header.cpp
        pv/view/logicsignal.cpp
        pv/view/ruler.cpp
@@ -128,7 +132,6 @@ set(pulseview_SOURCES
 )
 
 set(pulseview_HEADERS
-       signalhandler.h
        pv/mainwindow.h
        pv/sigsession.h
        pv/dialogs/about.h
@@ -151,6 +154,11 @@ set(pulseview_RESOURCES
        pulseview.qrc
 )
 
+if(ENABLE_SIGNALS)
+       list(APPEND pulseview_SOURCES signalhandler.cpp)
+       list(APPEND pulseview_HEADERS signalhandler.h)
+endif()
+
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})