X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=bde27c13c900b9c8096d712c1738cf83569042cd;hp=546b99dcfe98b615a44594ebcf351de396effe46;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hpb=819e2e95555b2b3c2190f24a3cfa82250d1f34e5 diff --git a/CMakeLists.txt b/CMakeLists.txt index 546b99dc..bde27c13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,10 +65,10 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrokxx>=0.3.0) +list(APPEND PKGDEPS libsigrokcxx>=0.4.0) if(ENABLE_DECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.3.0) + list(APPEND PKGDEPS libsigrokdecode>=0.4.0) endif() if(ANDROID) @@ -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,13 +121,40 @@ 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") -set(PV_VERSION_MAJOR 0) -set(PV_VERSION_MINOR 2) -set(PV_VERSION_MICRO 0) -set(PV_VERSION_STRING - ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO} -) +include(GetGitRevisionDescription) +git_describe(PV_TAG_VERSION_STRING --tags --dirty) + +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) +endif() + +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}) +endif() + +message("-- ${PV_TITLE} version: ${PV_VERSION_STRING}") configure_file ( ${PROJECT_SOURCE_DIR}/config.h.in @@ -146,14 +173,23 @@ set(pulseview_SOURCES pv/session.cpp pv/storesession.cpp pv/util.cpp + pv/binding/binding.cpp + pv/binding/inputoutput.cpp + pv/binding/device.cpp pv/data/analog.cpp pv/data/analogsegment.cpp pv/data/logic.cpp pv/data/logicsegment.cpp pv/data/signaldata.cpp pv/data/segment.cpp + pv/devices/device.cpp + pv/devices/file.cpp + pv/devices/hardwaredevice.cpp + pv/devices/inputfile.cpp + pv/devices/sessionfile.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp + pv/dialogs/inputoutputoptions.cpp pv/dialogs/storeprogress.cpp pv/popups/deviceoptions.cpp pv/popups/channels.cpp @@ -163,9 +199,7 @@ set(pulseview_SOURCES pv/prop/int.cpp pv/prop/property.cpp pv/prop/string.cpp - pv/prop/binding/binding.cpp - pv/prop/binding/deviceoptions.cpp - pv/toolbars/samplingbar.cpp + pv/toolbars/mainbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp pv/view/cursorpair.cpp @@ -186,11 +220,17 @@ set(pulseview_SOURCES pv/view/viewitem.cpp pv/view/viewitempaintparams.cpp pv/view/viewport.cpp + pv/view/viewwidget.cpp pv/widgets/colourbutton.cpp pv/widgets/colourpopup.cpp + pv/widgets/devicetoolbutton.cpp + pv/widgets/exportmenu.cpp + pv/widgets/hidingmenubar.cpp + pv/widgets/importmenu.cpp pv/widgets/popup.cpp pv/widgets/popuptoolbutton.cpp pv/widgets/sweeptimingwidget.cpp + pv/widgets/timestampspinbox.cpp pv/widgets/wellarray.cpp ) @@ -199,8 +239,10 @@ set(pulseview_HEADERS pv/mainwindow.hpp pv/session.hpp pv/storesession.hpp + pv/binding/device.hpp pv/dialogs/about.hpp pv/dialogs/connect.hpp + pv/dialogs/inputoutputoptions.hpp pv/dialogs/storeprogress.hpp pv/popups/channels.hpp pv/popups/deviceoptions.hpp @@ -210,8 +252,7 @@ set(pulseview_HEADERS pv/prop/int.hpp pv/prop/property.hpp pv/prop/string.hpp - pv/prop/binding/deviceoptions.hpp - pv/toolbars/samplingbar.hpp + pv/toolbars/mainbar.hpp pv/view/cursor.hpp pv/view/flag.hpp pv/view/header.hpp @@ -227,11 +268,17 @@ set(pulseview_HEADERS pv/view/view.hpp pv/view/viewitem.hpp pv/view/viewport.hpp + pv/view/viewwidget.hpp pv/widgets/colourbutton.hpp pv/widgets/colourpopup.hpp + pv/widgets/devicetoolbutton.hpp + pv/widgets/exportmenu.hpp + pv/widgets/hidingmenubar.hpp + pv/widgets/importmenu.hpp pv/widgets/popup.hpp pv/widgets/popuptoolbutton.hpp pv/widgets/sweeptimingwidget.hpp + pv/widgets/timestampspinbox.hpp pv/widgets/wellarray.hpp ) @@ -250,12 +297,12 @@ endif() if(ENABLE_DECODE) list(APPEND pulseview_SOURCES + pv/binding/decoder.cpp pv/data/decoderstack.cpp pv/data/decode/annotation.cpp pv/data/decode/decoder.cpp pv/data/decode/row.cpp pv/data/decode/rowdata.cpp - pv/prop/binding/decoderoptions.cpp pv/view/decodetrace.cpp pv/widgets/decodergroupbox.cpp pv/widgets/decodermenu.cpp @@ -285,7 +332,10 @@ if(Qt5Core_FOUND) qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) else() - qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) + # Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED. + # https://bugreports.qt.io/browse/QTBUG-22829 + qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS} + OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED) qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) include(${QT_USE_FILE}) @@ -409,9 +459,9 @@ set(CPACK_PACKAGE_VERSION_PATCH ${PV_VERSION_MICRO}) set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README) set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING) set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git") -set(CPACK_SOURCE_PACKAGE_FILE_NAME - "${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PV_VERSION_STRING}") set(CPACK_SOURCE_GENERATOR "TGZ") +set(CPACK_INSTALL_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/CMake/writepackageversion.cmake) include(CPack)