Added ViewItemOwner

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a8eb5db9ca44e0ef26b1b71b1c0fb273eab6e4d..51170dee62255b9aa5fe6735423d945f73d83f9b 100644 (file)
--- 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 --tags --dirty)
+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 (
@@ -197,7 +208,6 @@ 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/timeitem.cpp
@@ -205,8 +215,11 @@ set(pulseview_SOURCES
        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
@@ -219,6 +232,7 @@ set(pulseview_SOURCES
        pv/widgets/popup.cpp
        pv/widgets/popuptoolbutton.cpp
        pv/widgets/sweeptimingwidget.cpp
+       pv/widgets/timestampspinbox.cpp
        pv/widgets/wellarray.cpp
 )
 
@@ -253,6 +267,7 @@ set(pulseview_HEADERS
        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
@@ -266,6 +281,7 @@ set(pulseview_HEADERS
        pv/widgets/popup.hpp
        pv/widgets/popuptoolbutton.hpp
        pv/widgets/sweeptimingwidget.hpp
+       pv/widgets/timestampspinbox.hpp
        pv/widgets/wellarray.hpp
 )
 
@@ -311,7 +327,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)
@@ -436,6 +455,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)
 #-------------------------------------------------------------------------------