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).
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)
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
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
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/sweeptimingwidget.cpp
+ pv/widgets/timestampspinbox.cpp
pv/widgets/wellarray.cpp
)
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
pv/widgets/popup.hpp
pv/widgets/popuptoolbutton.hpp
pv/widgets/sweeptimingwidget.hpp
+ pv/widgets/timestampspinbox.hpp
pv/widgets/wellarray.hpp
)
endif()
if(ANDROID)
- list(APPEND pulseview_SOURCES android/loghandler.cpp)
+ list(APPEND pulseview_SOURCES
+ android/assetreader.cpp
+ android/loghandler.cpp
+ )
endif()
if(Qt5Core_FOUND)
# 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)
#-------------------------------------------------------------------------------