X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=ce4139d9e42332b14908038fa106097f90bc18cc;hp=800ffe27fec0aea78c3d4cd20b9f9bae4d1be06c;hb=7c6cbdda4d7beaaf41c752826091b407a203df51;hpb=53a69fd4e21c9a872a265626b00a20365c49076f diff --git a/CMakeLists.txt b/CMakeLists.txt index 800ffe27..ce4139d9 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). @@ -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 ) @@ -277,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 ) @@ -447,6 +449,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) #-------------------------------------------------------------------------------