X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=9714d68c696f91631c6b38e0b5ecb1aa1623c537;hb=404aad0ed6bd90566739af6ecb57475bc02a7c8e;hp=8566adf04a8509294c0625f6f9521c4f76da8970;hpb=d52d8455db515a779b4451c223ba7aaded70951a;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8566adf..9714d68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@
 
 cmake_minimum_required(VERSION 2.6)
 include(FindPkgConfig)
+include(GNUInstallDirs)
 
 project(pulseview)
 
@@ -28,6 +29,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 +42,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()
 
 #===============================================================================
@@ -51,7 +56,7 @@ list(APPEND PKGDEPS
 )
 
 if(ENABLE_SIGROKDECODE)
-	list(APPEND PKGDEPS libsigrokdecode>=0.1.0)
+	list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
 endif()
 
 find_package(PkgConfig)
@@ -96,7 +101,7 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
-	signalhandler.cpp
+	pv/devicemanager.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
 	pv/data/analog.cpp
@@ -115,9 +120,11 @@ set(pulseview_SOURCES
 	pv/prop/property.cpp
 	pv/prop/binding/binding.cpp
 	pv/prop/binding/deviceoptions.cpp
+	pv/toolbars/contextbar.cpp
 	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,12 +135,12 @@ set(pulseview_SOURCES
 )
 
 set(pulseview_HEADERS
-	signalhandler.h
 	pv/mainwindow.h
 	pv/sigsession.h
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
 	pv/dialogs/deviceoptions.h
+	pv/toolbars/contextbar.h
 	pv/toolbars/samplingbar.h
 	pv/view/cursor.h
 	pv/view/header.h
@@ -151,6 +158,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})
@@ -217,12 +229,21 @@ add_executable(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
 
+if(WIN32)
+# Pass -mwindows so that no "DOS box" will open when PulseView is started.
+set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
+endif()
+
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------
 
+# Install the executable.
 install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
 
+# Install the manpage.
+install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
+
 #===============================================================================
 #= Packaging (handled by CPack)
 #-------------------------------------------------------------------------------