X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=a82953cc166141af626ace0e5d2b3a285bf20eea;hp=800ffe27fec0aea78c3d4cd20b9f9bae4d1be06c;hb=812c0e3592e51946947b55c54b906bf4a0cb30e9;hpb=53a69fd4e21c9a872a265626b00a20365c49076f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 800ffe27..a82953cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,9 +99,9 @@ else()
 endif()
 
 if(ENABLE_TESTS)
-	find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
+	find_package(Boost 1.48 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
-	find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
+	find_package(Boost 1.48 COMPONENTS filesystem system thread REQUIRED)
 endif()
 
 # Find the platform's thread library (needed for C++11 threads).
@@ -124,26 +124,14 @@ set(PV_DESCRIPTION "A GUI for sigrok")
 set(PV_VERSION_STRING "0.3.0")
 
 include(GetGitRevisionDescription)
-git_describe(PV_TAG_VERSION_STRING --tags --dirty)
 
-if(NOT PV_TAG_VERSION_STRING AND EXISTS "${PROJECT_SOURCE_DIR}/VERSION")
-	# Read the version from a file that is distributed with
-	# the source package (see writepackageversion.cmake).
-	file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PV_TAG_VERSION_STRING LIMIT_COUNT 1)
-endif()
-
-if(PV_TAG_VERSION_STRING MATCHES
-		"^pulseview-([0-9]+\\.[0-9]+\\.[0-9]+)(-[0-9a-z]+)?(-g[-0-9a-z]+)?$")
-	set(PV_TAG_VERSION ${CMAKE_MATCH_1})
-	set(PV_TAG_PATCHLEVEL ${CMAKE_MATCH_2})
-	set(PV_TAG_REVHASH ${CMAKE_MATCH_3})
-
-	if(PV_VERSION_STRING VERSION_GREATER ${PV_TAG_VERSION})
-		# Tagged version older than current one: indicate pre-release.
-		set(PV_VERSION_STRING "${PV_VERSION_STRING}-pre${PV_TAG_REVHASH}")
-	else()
-		# For post-release changes, indicate the patch level.
-		set(PV_VERSION_STRING "${PV_TAG_VERSION}${PV_TAG_PATCHLEVEL}${PV_TAG_REVHASH}")
+# Append the revision hash unless we are exactly on a tagged release.
+git_describe(PV_TAG_VERSION_STRING --match "pulseview-${PV_VERSION_STRING}" --exact-match)
+if(NOT PV_TAG_VERSION_STRING)
+	get_git_head_revision(PV_REVSPEC PV_HASH)
+	if(PV_HASH)
+		string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH)
+		set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}")
 	endif()
 endif()
 
@@ -208,16 +196,19 @@ set(pulseview_SOURCES
 	pv/view/marginwidget.cpp
 	pv/view/logicsignal.cpp
 	pv/view/rowitem.cpp
-	pv/view/rowitemowner.cpp
 	pv/view/ruler.cpp
 	pv/view/signal.cpp
+	pv/view/signalscalehandle.cpp
 	pv/view/timeitem.cpp
 	pv/view/timemarker.cpp
 	pv/view/trace.cpp
 	pv/view/tracegroup.cpp
 	pv/view/tracepalette.cpp
+	pv/view/tracetreeitem.cpp
+	pv/view/tracetreeitemowner.cpp
 	pv/view/view.cpp
 	pv/view/viewitem.cpp
+	pv/view/viewitemowner.cpp
 	pv/view/viewitempaintparams.cpp
 	pv/view/viewport.cpp
 	pv/view/viewwidget.cpp
@@ -230,6 +221,7 @@ set(pulseview_SOURCES
 	pv/widgets/popup.cpp
 	pv/widgets/popuptoolbutton.cpp
 	pv/widgets/sweeptimingwidget.cpp
+	pv/widgets/timestampspinbox.cpp
 	pv/widgets/wellarray.cpp
 )
 
@@ -260,10 +252,12 @@ set(pulseview_HEADERS
 	pv/view/rowitem.hpp
 	pv/view/ruler.hpp
 	pv/view/signal.hpp
+	pv/view/signalscalehandle.hpp
 	pv/view/timeitem.hpp
 	pv/view/timemarker.hpp
 	pv/view/trace.hpp
 	pv/view/tracegroup.hpp
+	pv/view/tracetreeitem.hpp
 	pv/view/view.hpp
 	pv/view/viewitem.hpp
 	pv/view/viewport.hpp
@@ -277,6 +271,7 @@ set(pulseview_HEADERS
 	pv/widgets/popup.hpp
 	pv/widgets/popuptoolbutton.hpp
 	pv/widgets/sweeptimingwidget.hpp
+	pv/widgets/timestampspinbox.hpp
 	pv/widgets/wellarray.hpp
 )
 
@@ -322,7 +317,10 @@ if(WIN32)
 endif()
 
 if(ANDROID)
-	list(APPEND pulseview_SOURCES android/loghandler.cpp)
+	list(APPEND pulseview_SOURCES
+		android/assetreader.cpp
+		android/loghandler.cpp
+	)
 endif()
 
 if(Qt5Core_FOUND)
@@ -447,6 +445,9 @@ install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
 # Install the manpage.
 install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
 
+# Generate Windows installer script.
+configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY)
+
 #===============================================================================
 #= Packaging (handled by CPack)
 #-------------------------------------------------------------------------------
@@ -459,7 +460,6 @@ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PV_VERSION_STRING}")
 set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_INSTALL_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/CMake/writepackageversion.cmake)
 
 include(CPack)