X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=d835927ebb504a0696d07b5a0b84b5f49fa1015d;hp=2d9ec8f2ff76fd9260d6315e2d4a641c3f399064;hb=a2ae0205f2737dfd8f7647f9eae2fdcb47a0ad25;hpb=140181a46034cf65739ba4bf0bf1260ab94ac736

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d9ec8f2..d835927e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@
 
 cmake_minimum_required(VERSION 2.6)
 include(FindPkgConfig)
+include(GNUInstallDirs)
 
 project(pulseview)
 
@@ -55,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)
@@ -100,6 +101,7 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
+	pv/devicemanager.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
 	pv/data/analog.cpp
@@ -118,12 +120,16 @@ 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/marginwidget.cpp
 	pv/view/logicsignal.cpp
 	pv/view/ruler.cpp
+	pv/view/selectableitem.cpp
 	pv/view/signal.cpp
 	pv/view/timemarker.cpp
 	pv/view/view.cpp
@@ -136,10 +142,14 @@ set(pulseview_HEADERS
 	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
+	pv/view/marginwidget.h
 	pv/view/ruler.h
+	pv/view/selectableitem.h
+	pv/view/signal.h
 	pv/view/timemarker.h
 	pv/view/view.h
 	pv/view/viewport.h
@@ -224,12 +234,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)
 #-------------------------------------------------------------------------------