X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=a979be66855d4fdf974ebfb61443573a62268d8a;hp=8b5214435e1866f92e37295b11a7b888d99818bc;hb=af503b104d890a357c736c678bb00296d889c090;hpb=d69b3c315c5335091a659a3c268cd5f7e27a4b26

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b521443..a979be66 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).
@@ -126,7 +126,7 @@ set(PV_VERSION_STRING "0.3.0")
 include(GetGitRevisionDescription)
 git_describe(PV_TAG_VERSION_STRING --tags --dirty)
 
-if(NOT PV_TAG_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_TAG_VERSION_STRING LIMIT_COUNT 1)
@@ -207,8 +207,6 @@ set(pulseview_SOURCES
 	pv/view/header.cpp
 	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
@@ -216,6 +214,8 @@ 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/viewitempaintparams.cpp
@@ -230,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
 )
 
@@ -264,6 +265,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
@@ -277,6 +279,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 +325,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 +453,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)
 #-------------------------------------------------------------------------------