X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=1a342b8f7e8f7bcda8280c28a852f2a811380b89;hp=39f0c07f57dd96fdc4396569b2596a357c616412;hb=323715c41a09a1aba08f4b716e9d93da58f0f3a8;hpb=477472187338948c83bea5d790ead66034008296 diff --git a/CMakeLists.txt b/CMakeLists.txt index 39f0c07f..1a342b8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,16 +24,28 @@ include(GNUInstallDirs) project(pulseview) +# Let AUTOMOC and AUTOUIC process GENERATED files. +if(POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) +endif() + +# Only interpret if() arguments as variables or keywords when unquoted. +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") #=============================================================================== #= User Options #------------------------------------------------------------------------------- -option(DISABLE_WERROR "Build without -Werror" FALSE) +option(DISABLE_WERROR "Build without -Werror" TRUE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) +option(ENABLE_STACKTRACE "Enable stack trace when crashing" FALSE) option(ENABLE_DECODE "Build with libsigrokdecode" TRUE) -option(ENABLE_TESTS "Enable unit tests" TRUE) +option(ENABLE_FLOW "Build with libsigrokflow" FALSE) +option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE) if(WIN32) @@ -51,6 +63,12 @@ if(NOT CMAKE_BUILD_TYPE) FORCE) endif() +#=============================================================================== +#= Documentation +#------------------------------------------------------------------------------- + +add_subdirectory(manual) + #=============================================================================== #= Dependencies #------------------------------------------------------------------------------- @@ -58,10 +76,16 @@ endif() list(APPEND PKGDEPS glib-2.0>=2.28.0) list(APPEND PKGDEPS glibmm-2.4>=2.28.0) -list(APPEND PKGDEPS libsigrokcxx>=0.5.0) +if(ENABLE_FLOW) + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) + list(APPEND PKGDEPS libsigrokflow>=0.1.0) +endif() + +set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.1") +list(APPEND PKGDEPS "${LIBSR_CXX_BINDING}") if(ENABLE_DECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.5.0) + list(APPEND PKGDEPS libsigrokdecode>=0.5.2) endif() if(ANDROID) @@ -69,6 +93,10 @@ if(ANDROID) endif() find_package(PkgConfig) +pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) +if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) + message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") +endif() pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) set(CMAKE_AUTOMOC TRUE) @@ -78,7 +106,10 @@ find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED) if(WIN32) # MXE workaround: Use pkg-config to find Qt5 libs. # https://github.com/mxe/mxe/issues/1642 - pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg) + # Not required (and doesn't work) on MSYS2. + if(NOT DEFINED ENV{MSYSTEM}) + pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg) + endif() endif() set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg) @@ -87,7 +118,12 @@ set(BOOSTCOMPS filesystem serialization system) if(ENABLE_TESTS) list(APPEND BOOSTCOMPS unit_test_framework) endif() -find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED) + +if(ENABLE_STACKTRACE) + find_package(Boost 1.65.1 COMPONENTS ${BOOSTCOMPS} REQUIRED) +else() + find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED) +endif() # Find the platform's thread library (needed for C++11 threads). # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. @@ -167,6 +203,12 @@ if(NOT PV_TAG_VERSION_STRING) string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH) set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}") endif() + + # Non-tagged releases use the unstable manual + set(PV_MANUAL_VERSION "unstable") +else() + # Tagged releases use a fixed manual version + set(PV_MANUAL_VERSION ${PV_VERSION_STRING}) endif() if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$") @@ -176,7 +218,7 @@ if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$") set(PV_VERSION_SUFFIX ${CMAKE_MATCH_4}) endif() -message("-- ${PV_TITLE} version: ${PV_VERSION_STRING}") +message(STATUS "${PV_TITLE} version: ${PV_VERSION_STRING}") configure_file ( ${PROJECT_SOURCE_DIR}/config.h.in @@ -192,6 +234,7 @@ set(pulseview_SOURCES pv/application.cpp pv/devicemanager.cpp pv/globalsettings.cpp + pv/logging.cpp pv/mainwindow.cpp pv/session.cpp pv/storesession.cpp @@ -234,7 +277,6 @@ set(pulseview_SOURCES pv/views/trace/rowitem.cpp pv/views/trace/ruler.cpp pv/views/trace/signal.cpp - pv/views/trace/signalscalehandle.cpp pv/views/trace/timeitem.cpp pv/views/trace/timemarker.cpp pv/views/trace/trace.cpp @@ -251,8 +293,8 @@ set(pulseview_SOURCES pv/views/trace/viewwidget.cpp pv/views/viewbase.cpp pv/views/trace/standardbar.cpp - pv/widgets/colourbutton.cpp - pv/widgets/colourpopup.cpp + pv/widgets/colorbutton.cpp + pv/widgets/colorpopup.cpp pv/widgets/devicetoolbutton.cpp pv/widgets/exportmenu.cpp pv/widgets/importmenu.cpp @@ -265,6 +307,7 @@ set(pulseview_SOURCES # This list includes only QObject derived class headers. set(pulseview_HEADERS + pv/logging.hpp pv/globalsettings.hpp pv/mainwindow.hpp pv/session.hpp @@ -297,7 +340,6 @@ set(pulseview_HEADERS pv/views/trace/rowitem.hpp pv/views/trace/ruler.hpp pv/views/trace/signal.hpp - pv/views/trace/signalscalehandle.hpp pv/views/trace/timeitem.hpp pv/views/trace/timemarker.hpp pv/views/trace/trace.hpp @@ -310,8 +352,8 @@ set(pulseview_HEADERS pv/views/trace/viewwidget.hpp pv/views/viewbase.hpp pv/views/trace/standardbar.hpp - pv/widgets/colourbutton.hpp - pv/widgets/colourpopup.hpp + pv/widgets/colorbutton.hpp + pv/widgets/colorpopup.hpp pv/widgets/devicetoolbutton.hpp pv/widgets/exportmenu.hpp pv/widgets/importmenu.hpp @@ -378,6 +420,10 @@ add_definitions(-Wall -Wextra) add_definitions(-std=c++11) add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) +if(ENABLE_FLOW) + add_definitions(-DENABLE_FLOW) +endif() + if(ENABLE_DECODE) add_definitions(-DENABLE_DECODE) endif() @@ -390,6 +436,10 @@ if(ENABLE_SIGNALS) add_definitions(-DENABLE_SIGNALS) endif() +if(ENABLE_STACKTRACE) + add_definitions(-DENABLE_STACKTRACE) +endif() + #=============================================================================== #= Global Include Directories #------------------------------------------------------------------------------- @@ -430,12 +480,20 @@ endif() if(WIN32) # On Windows we need to statically link the libqsvg imageformat # plugin (and the QtSvg component) for SVG graphics/icons to work. - # We also need QWindowsIntegrationPlugin, Qt5PlatformSupport, and all - # Qt libs and their dependencies. + # We also need QWindowsIntegrationPlugin, Qt5PlatformSupport (only for + # Qt < 5.8.0), and all Qt libs and their dependencies. add_definitions(-DQT_STATICPLUGIN) list(APPEND PULSEVIEW_LINK_LIBS Qt5::QSvgPlugin) list(APPEND PULSEVIEW_LINK_LIBS Qt5::QWindowsIntegrationPlugin) - list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport ${QT5ALL_LDFLAGS}) + if(Qt5Gui_VERSION VERSION_LESS 5.8.0) + list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport) + endif() + list(APPEND PULSEVIEW_LINK_LIBS ${QT5ALL_LDFLAGS}) +endif() + +if(ENABLE_STACKTRACE) + # Needed to resolve dladdr. + list(APPEND PULSEVIEW_LINK_LIBS "-ldl") endif() if(ANDROID) @@ -450,7 +508,7 @@ endif() target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) -if(WIN32) +if(WIN32 AND NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug") # Pass -mwindows so that no "DOS box" opens when PulseView is started. set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows") endif() @@ -476,7 +534,7 @@ install(FILES icons/pulseview.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons install(FILES icons/pulseview.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps) # Generate Windows installer script. -configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY) +configure_file(contrib/pulseview_cross.nsi.in ${CMAKE_CURRENT_BINARY_DIR}/contrib/pulseview_cross.nsi @ONLY) #=============================================================================== #= Packaging (handled by CPack)