X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=ca4142c481afd7b478201ae8f343b2d2debf9579;hp=a82953cc166141af626ace0e5d2b3a285bf20eea;hb=6e2a5b1d677a26a637465cd4d304e2bc52e14f36;hpb=812c0e3592e51946947b55c54b906bf4a0cb30e9 diff --git a/CMakeLists.txt b/CMakeLists.txt index a82953cc..ca4142c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,8 @@ ## along with this program. If not, see . ## -cmake_minimum_required(VERSION 2.8.6) +cmake_minimum_required(VERSION 2.8.12) -include(FindPkgConfig) include(GNUInstallDirs) project(pulseview) @@ -34,23 +33,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) option(ENABLE_DECODE "Build with libsigrokdecode" TRUE) -option(ENABLE_TESTS "Enable unit tests" FALSE) +option(ENABLE_TESTS "Enable unit tests" TRUE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE) -option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE) if(WIN32) # On Windows/MinGW we need to statically link to libraries. # This option is user configurable, but enable it by default on win32. set(STATIC_PKGDEPS_LIBS TRUE) - # For boost-thread we need two additional settings on win32: - set(Boost_USE_STATIC_LIBS ON) - add_definitions(-DBOOST_THREAD_USE_LIB) - - # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'. - # The library is named libboost_thread_win32* (not libboost_thread*). - set(Boost_THREADAPI win32) - # Windows does not support UNIX signals. set(ENABLE_SIGNALS FALSE) endif() @@ -65,10 +55,13 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrokcxx>=0.4.0) +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_DECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.4.0) + list(APPEND PKGDEPS libsigrokdecode>=0.5.0) endif() if(ANDROID) @@ -78,36 +71,76 @@ endif() find_package(PkgConfig) pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) -if(FORCE_QT4) - set(Qt5Core_FOUND FALSE) -else() - find_package(Qt5Core QUIET) -endif() +set(CMAKE_AUTOMOC TRUE) -if(Qt5Core_FOUND) - message("-- Using Qt5") - find_package(Qt5Widgets REQUIRED) - find_package(Qt5Gui REQUIRED) - find_package(Qt5Svg REQUIRED) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") - set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) - set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg) - add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) -else() - find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) - find_package(Qt4 REQUIRED QtCore QtGui QtSvg) +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) endif() +set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg) + +set(BOOSTCOMPS filesystem serialization system) if(ENABLE_TESTS) - find_package(Boost 1.48 COMPONENTS filesystem system thread unit_test_framework REQUIRED) -else() - find_package(Boost 1.48 COMPONENTS filesystem system thread REQUIRED) + list(APPEND BOOSTCOMPS unit_test_framework) endif() +find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED) # Find the platform's thread library (needed for C++11 threads). # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. find_package(Threads REQUIRED) +# Check for explicit link against libatomic +# +# Depending on the toolchain, linking a program using atomic functions may need +# "-latomic" explicitly passed to the linker +# +# This check first tests if atomics are available in the C-library, if not and +# libatomic exists, then it runs the same test with -latomic added to the +# linker flags. + +# Helper for checking for atomics +function(check_working_cxx_atomics varname additional_lib) + include(CheckCXXSourceCompiles) + include(CMakePushCheckState) + cmake_push_check_state() + set(CMAKE_REQUIRED_FLAGS "-std=c++11") + set(CMAKE_REQUIRED_LIBRARIES "${additional_lib}") + set(CMAKE_REQUIRED_QUIET 1) + CHECK_CXX_SOURCE_COMPILES(" +#include +std::atomic x; +int main() { + return std::atomic_fetch_add_explicit(&x, 1, std::memory_order_seq_cst); +} +" ${varname}) + cmake_pop_check_state() +endfunction(check_working_cxx_atomics) + +# First check if atomics work without the library. +# If not, check if the library exists, and atomics work with it. +check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB "") +if(HAVE_CXX_ATOMICS_WITHOUT_LIB) + message(STATUS "Atomics provided by the C-library - yes") +else() + message(STATUS "Atomics provided by the C-library - no") + find_library(LIBATOMIC_LIBRARY NAMES atomic PATH_SUFFIXES lib) + if(LIBATOMIC_LIBRARY) + check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB "${LIBATOMIC_LIBRARY}") + if (HAVE_CXX_ATOMICS_WITH_LIB) + message(STATUS "Atomics provided by libatomic - yes") + else() + message(STATUS "Atomics provided by libatomic - no") + message(FATAL_ERROR "Compiler must support std::atomic!") + endif() + else() + message(FATAL_ERROR "Compiler appears to require libatomic, but cannot find it.") + endif() +endif() + #=============================================================================== #= System Introspection #------------------------------------------------------------------------------- @@ -120,8 +153,9 @@ 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_STRING "0.5.0") + +set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) include(GetGitRevisionDescription) @@ -157,6 +191,7 @@ set(pulseview_SOURCES main.cpp pv/application.cpp pv/devicemanager.cpp + pv/globalsettings.cpp pv/mainwindow.cpp pv/session.cpp pv/storesession.cpp @@ -168,6 +203,7 @@ set(pulseview_SOURCES pv/data/analogsegment.cpp pv/data/logic.cpp pv/data/logicsegment.cpp + pv/data/signalbase.cpp pv/data/signaldata.cpp pv/data/segment.cpp pv/devices/device.cpp @@ -175,9 +211,9 @@ set(pulseview_SOURCES 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/settings.cpp pv/dialogs/storeprogress.cpp pv/popups/deviceoptions.cpp pv/popups/channels.cpp @@ -188,35 +224,37 @@ set(pulseview_SOURCES pv/prop/property.cpp pv/prop/string.cpp pv/toolbars/mainbar.cpp - pv/view/analogsignal.cpp - pv/view/cursor.cpp - pv/view/cursorpair.cpp - pv/view/flag.cpp - pv/view/header.cpp - pv/view/marginwidget.cpp - pv/view/logicsignal.cpp - pv/view/rowitem.cpp - pv/view/ruler.cpp - pv/view/signal.cpp - pv/view/signalscalehandle.cpp - pv/view/timeitem.cpp - pv/view/timemarker.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/views/trace/analogsignal.cpp + pv/views/trace/cursor.cpp + pv/views/trace/cursorpair.cpp + pv/views/trace/flag.cpp + pv/views/trace/header.cpp + pv/views/trace/marginwidget.cpp + pv/views/trace/logicsignal.cpp + 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 + pv/views/trace/tracegroup.cpp + pv/views/trace/tracepalette.cpp + pv/views/trace/tracetreeitem.cpp + pv/views/trace/tracetreeitemowner.cpp + pv/views/trace/triggermarker.cpp + pv/views/trace/view.cpp + pv/views/trace/viewitem.cpp + pv/views/trace/viewitemowner.cpp + pv/views/trace/viewitempaintparams.cpp + pv/views/trace/viewport.cpp + pv/views/trace/viewwidget.cpp + pv/views/viewbase.cpp + pv/views/trace/standardbar.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 @@ -227,13 +265,19 @@ set(pulseview_SOURCES # This list includes only QObject derived class headers. set(pulseview_HEADERS + pv/globalsettings.hpp pv/mainwindow.hpp pv/session.hpp pv/storesession.hpp pv/binding/device.hpp - pv/dialogs/about.hpp + pv/data/analog.hpp + pv/data/analogsegment.hpp + pv/data/logic.hpp + pv/data/logicsegment.hpp + pv/data/signalbase.hpp pv/dialogs/connect.hpp pv/dialogs/inputoutputoptions.hpp + pv/dialogs/settings.hpp pv/dialogs/storeprogress.hpp pv/popups/channels.hpp pv/popups/deviceoptions.hpp @@ -244,29 +288,32 @@ set(pulseview_HEADERS pv/prop/property.hpp pv/prop/string.hpp pv/toolbars/mainbar.hpp - pv/view/cursor.hpp - pv/view/flag.hpp - pv/view/header.hpp - pv/view/logicsignal.hpp - pv/view/marginwidget.hpp - pv/view/rowitem.hpp - pv/view/ruler.hpp - pv/view/signal.hpp - pv/view/signalscalehandle.hpp - pv/view/timeitem.hpp - 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/view/viewwidget.hpp + pv/views/trace/analogsignal.hpp + pv/views/trace/cursor.hpp + pv/views/trace/flag.hpp + pv/views/trace/header.hpp + pv/views/trace/logicsignal.hpp + pv/views/trace/marginwidget.hpp + 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 + pv/views/trace/tracegroup.hpp + pv/views/trace/tracetreeitem.hpp + pv/views/trace/triggermarker.hpp + pv/views/trace/view.hpp + pv/views/trace/viewitem.hpp + pv/views/trace/viewport.hpp + pv/views/trace/viewwidget.hpp + pv/views/viewbase.hpp + pv/views/trace/standardbar.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 @@ -275,10 +322,6 @@ set(pulseview_HEADERS pv/widgets/wellarray.hpp ) -set(pulseview_FORMS - pv/dialogs/about.ui -) - set(pulseview_RESOURCES pulseview.qrc ) @@ -296,14 +339,14 @@ if(ENABLE_DECODE) pv/data/decode/decoder.cpp pv/data/decode/row.cpp pv/data/decode/rowdata.cpp - pv/view/decodetrace.cpp + pv/views/trace/decodetrace.cpp pv/widgets/decodergroupbox.cpp pv/widgets/decodermenu.cpp ) list(APPEND pulseview_HEADERS pv/data/decoderstack.hpp - pv/view/decodetrace.hpp + pv/views/trace/decodetrace.hpp pv/widgets/decodergroupbox.hpp pv/widgets/decodermenu.hpp ) @@ -323,28 +366,17 @@ if(ANDROID) ) endif() -if(Qt5Core_FOUND) - qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) - qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) - qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) -else() - # 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}) -endif() +qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) #=============================================================================== #= Global Definitions #------------------------------------------------------------------------------- -add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS) +add_definitions(-DQT_NO_KEYWORDS) add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) add_definitions(-std=c++11) +add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) if(ENABLE_DECODE) add_definitions(-DENABLE_DECODE) @@ -366,7 +398,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} - ${QT_INCLUDE_DIRS} ) if(STATIC_PKGDEPS_LIBS) @@ -385,15 +416,12 @@ set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} + ${LIBATOMIC_LIBRARY} ) if(STATIC_PKGDEPS_LIBS) link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS}) - list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES}) -if(WIN32) - # Workaround for a MinGW linking issue. - list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") -endif() + list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LDFLAGS}) else() link_directories(${PKGDEPS_LIBRARY_DIRS}) list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES}) @@ -402,10 +430,12 @@ 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. add_definitions(-DQT_STATICPLUGIN) - link_directories("${QT_PLUGINS_DIR}/imageformats") - list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg") - list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY}) + list(APPEND PULSEVIEW_LINK_LIBS Qt5::QSvgPlugin) + list(APPEND PULSEVIEW_LINK_LIBS Qt5::QWindowsIntegrationPlugin) + list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport ${QT5ALL_LDFLAGS}) endif() if(ANDROID) @@ -413,19 +443,9 @@ if(ANDROID) endif() if(ANDROID) -add_library(${PROJECT_NAME} SHARED - ${pulseview_SOURCES} - ${pulseview_HEADERS_MOC} - ${pulseview_FORMS_HEADERS} - ${pulseview_RESOURCES_RCC} -) + add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC}) else() -add_executable(${PROJECT_NAME} - ${pulseview_SOURCES} - ${pulseview_HEADERS_MOC} - ${pulseview_FORMS_HEADERS} - ${pulseview_RESOURCES_RCC} -) + add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC}) endif() target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) @@ -445,6 +465,16 @@ install(TARGETS ${PROJECT_NAME} DESTINATION bin/) # Install the manpage. install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) +# Install the desktop file. +install(FILES contrib/org.sigrok.PulseView.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) + +# Install the AppData/AppStream file. +install(FILES contrib/org.sigrok.PulseView.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) + +# Install the PulseView icons. +install(FILES icons/pulseview.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps) +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)