X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=bde27c13c900b9c8096d712c1738cf83569042cd;hp=e1bc3a60f856b63ad08eb80f57089d3bb69b6884;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hpb=1e8c82e90f947b5803430b08b7912ea3c95fd604

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1bc3a60..bde27c13 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).
@@ -121,28 +121,39 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
 
 set(PV_TITLE PulseView)
 set(PV_DESCRIPTION "A GUI for sigrok")
+set(PV_VERSION_STRING "0.3.0")
 
 include(GetGitRevisionDescription)
-git_describe(PV_NAME_VERSION_STRING)
+git_describe(PV_TAG_VERSION_STRING --tags --dirty)
 
-if(NOT PV_NAME_VERSION_STRING)
+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_NAME_VERSION_STRING LIMIT_COUNT 1)
+	file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PV_TAG_VERSION_STRING LIMIT_COUNT 1)
 endif()
 
-if(PV_NAME_VERSION_STRING MATCHES "^pulseview-([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]+)?$")
+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}")
+	endif()
+endif()
+
+if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$")
 	set(PV_VERSION_MAJOR ${CMAKE_MATCH_1})
 	set(PV_VERSION_MINOR ${CMAKE_MATCH_2})
 	set(PV_VERSION_MICRO ${CMAKE_MATCH_3})
 	set(PV_VERSION_SUFFIX ${CMAKE_MATCH_4})
-else()
-	message(FATAL_ERROR "-- Cannot get the ${PV_TITLE} version from anywhere")
 endif()
 
-set(PV_VERSION_STRING
-	${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}${PV_VERSION_SUFFIX}
-)
 message("-- ${PV_TITLE} version: ${PV_VERSION_STRING}")
 
 configure_file (
@@ -219,6 +230,7 @@ set(pulseview_SOURCES
 	pv/widgets/popup.cpp
 	pv/widgets/popuptoolbutton.cpp
 	pv/widgets/sweeptimingwidget.cpp
+	pv/widgets/timestampspinbox.cpp
 	pv/widgets/wellarray.cpp
 )
 
@@ -266,6 +278,7 @@ set(pulseview_HEADERS
 	pv/widgets/popup.hpp
 	pv/widgets/popuptoolbutton.hpp
 	pv/widgets/sweeptimingwidget.hpp
+	pv/widgets/timestampspinbox.hpp
 	pv/widgets/wellarray.hpp
 )