X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=d85948c095afbd7713709f0705c5f334a8dddb66;hp=51ba86ef31583d28470e4296cbf3b0b45f4e9649;hb=2b334bb4078d6e74e8ed4e3460c6596344dd9c8d;hpb=f0d37dab05f9fb055a9af8a05d776d1a5b4b0909 diff --git a/CMakeLists.txt b/CMakeLists.txt index 51ba86ef..d85948c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,7 @@ cmake_minimum_required(VERSION 2.8.6) include(FindPkgConfig) include(GNUInstallDirs) -set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") -include(cotire) +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") project(pulseview) @@ -34,49 +33,72 @@ project(pulseview) option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) +option(ENABLE_DECODE "Build with libsigrokdecode" TRUE) +option(ENABLE_COTIRE "Enable cotire" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) -option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE) +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) - - # Windsws does not support UNIX signals + # Windows does not support UNIX signals. set(ENABLE_SIGNALS FALSE) endif() +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) +endif() + #=============================================================================== #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS - libsigrok>=0.2.0 - libsigrokdecode>=0.2.0 -) +list(APPEND PKGDEPS libsigrok>=0.3.0) + +if(ENABLE_DECODE) + list(APPEND PKGDEPS libsigrokdecode>=0.3.0) +endif() + +if(ANDROID) + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) +endif() find_package(PkgConfig) pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) -find_package(Qt4 REQUIRED) - -# Find the platform's thread library (needed for boost-thread). -# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. -find_package(Threads) +if(FORCE_QT4) + set(Qt5Core_FOUND FALSE) +else() + find_package(Qt5Core QUIET) +endif() -if(WIN32) -# On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'. -# The library is named libboost_thread_win32* (not libboost_thread*). -find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED) +if(Qt5Core_FOUND) + message("-- Using Qt5") + find_package(Qt5Widgets REQUIRED) + find_package(Qt5Gui 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) + add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) else() -find_package(Boost 1.42 COMPONENTS system thread REQUIRED) + find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) + find_package(Qt4 REQUIRED) endif() +find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED) + +#=============================================================================== +#= System Introspection +#------------------------------------------------------------------------------- + +include(memaccess) +memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) + #=============================================================================== #= Config Header #------------------------------------------------------------------------------- @@ -85,7 +107,7 @@ set(PV_TITLE PulseView) set(PV_DESCRIPTION "A GUI for sigrok") set(PV_VERSION_MAJOR 0) -set(PV_VERSION_MINOR 1) +set(PV_VERSION_MINOR 2) set(PV_VERSION_MICRO 0) set(PV_VERSION_STRING ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO} @@ -105,17 +127,23 @@ set(pulseview_SOURCES pv/devicemanager.cpp pv/mainwindow.cpp pv/sigsession.cpp + pv/storesession.cpp + pv/util.cpp pv/data/analog.cpp pv/data/analogsnapshot.cpp - pv/data/decoder.cpp pv/data/logic.cpp pv/data/logicsnapshot.cpp pv/data/signaldata.cpp pv/data/snapshot.cpp + pv/device/device.cpp + pv/device/file.cpp + pv/device/devinst.cpp + pv/device/sessionfile.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp + pv/dialogs/storeprogress.cpp pv/popups/deviceoptions.cpp - pv/popups/probes.cpp + pv/popups/channels.cpp pv/prop/bool.cpp pv/prop/double.cpp pv/prop/enum.cpp @@ -123,13 +151,12 @@ set(pulseview_SOURCES pv/prop/property.cpp pv/prop/string.cpp pv/prop/binding/binding.cpp - pv/prop/binding/decoderoptions.cpp pv/prop/binding/deviceoptions.cpp pv/toolbars/samplingbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp + pv/view/cursorheader.cpp pv/view/cursorpair.cpp - pv/view/decodetrace.cpp pv/view/header.cpp pv/view/marginwidget.cpp pv/view/logicsignal.cpp @@ -141,24 +168,25 @@ set(pulseview_SOURCES pv/view/tracepalette.cpp pv/view/view.cpp pv/view/viewport.cpp - pv/view/decode/annotation.cpp pv/widgets/colourbutton.cpp pv/widgets/colourpopup.cpp - pv/widgets/decodermenu.cpp pv/widgets/popup.cpp pv/widgets/popuptoolbutton.cpp + pv/widgets/sweeptimingwidget.cpp pv/widgets/wellarray.cpp ) -# This list includes only QObject derrived class headers +# This list includes only QObject derived class headers. set(pulseview_HEADERS pv/mainwindow.h pv/sigsession.h - pv/data/decoder.h + pv/storesession.h + pv/device/devinst.h pv/dialogs/about.h pv/dialogs/connect.h + pv/dialogs/storeprogress.h + pv/popups/channels.h pv/popups/deviceoptions.h - pv/popups/probes.h pv/prop/bool.h pv/prop/double.h pv/prop/enum.h @@ -167,7 +195,7 @@ set(pulseview_HEADERS pv/prop/string.h pv/toolbars/samplingbar.h pv/view/cursor.h - pv/view/decodetrace.h + pv/view/cursorheader.h pv/view/header.h pv/view/logicsignal.h pv/view/marginwidget.h @@ -180,8 +208,9 @@ set(pulseview_HEADERS pv/view/viewport.h pv/widgets/colourbutton.h pv/widgets/colourpopup.h - pv/widgets/decodermenu.h + pv/widgets/popup.h pv/widgets/popuptoolbutton.h + pv/widgets/sweeptimingwidget.h pv/widgets/wellarray.h ) @@ -198,23 +227,70 @@ if(ENABLE_SIGNALS) list(APPEND pulseview_HEADERS signalhandler.h) endif() -qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) -qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) -qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) +if(ENABLE_DECODE) + list(APPEND pulseview_SOURCES + 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 + ) + + list(APPEND pulseview_HEADERS + pv/data/decoderstack.h + pv/view/decodetrace.h + pv/widgets/decodergroupbox.h + pv/widgets/decodermenu.h + ) +endif() + +if(WIN32) + # Use the sigrok icon for the pulseview.exe executable. + set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} ") + enable_language(RC) + list(APPEND pulseview_SOURCES pulseviewico.rc) +endif() -include(${QT_USE_FILE}) +if(ANDROID) + list(APPEND pulseview_SOURCES android/loghandler.cpp) +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() + qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) + qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) + qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) + include(${QT_USE_FILE}) +endif() #=============================================================================== #= Global Definitions #------------------------------------------------------------------------------- -add_definitions(${QT_DEFINITIONS}) +add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS) +add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) +add_definitions(-std=c++11) + +if(ENABLE_DECODE) + add_definitions(-DENABLE_DECODE) +endif() if(NOT DISABLE_WERROR) add_definitions(-Werror) endif() +if(ENABLE_SIGNALS) + add_definitions(-DENABLE_SIGNALS) +endif() + #=============================================================================== #= Global Include Directories #------------------------------------------------------------------------------- @@ -223,6 +299,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} ) if(STATIC_PKGDEPS_LIBS) @@ -239,31 +316,60 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ) 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() else() link_directories(${PKGDEPS_LIBRARY_DIRS}) list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES}) endif() +if(WIN32) + # On Windows we need to statically link the libqsvg imageformat + # plugin (and the QtSvg component) for SVG graphics/icons to work. + add_definitions(-DQT_STATICPLUGIN) + link_directories("${QT_PLUGINS_DIR}/imageformats") + list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY}) + list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg") +endif() + +if(ANDROID) + list(APPEND PULSEVIEW_LINK_LIBS "-llog") +endif() + +if(ANDROID) +add_library(${PROJECT_NAME} SHARED + ${pulseview_SOURCES} + ${pulseview_HEADERS_MOC} + ${pulseview_FORMS_HEADERS} + ${pulseview_RESOURCES_RCC} +) +else() add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} ${pulseview_FORMS_HEADERS} ${pulseview_RESOURCES_RCC} ) +endif() target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) -cotire(${PROJECT_NAME}) if(WIN32) -# Pass -mwindows so that no "DOS box" will open when PulseView is started. -set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows") + # Pass -mwindows so that no "DOS box" opens when PulseView is started. + set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows") +endif() + +if(ENABLE_COTIRE) + include(cotire) + cotire(${PROJECT_NAME}) endif() #=============================================================================== @@ -300,4 +406,4 @@ if(ENABLE_TESTS) add_subdirectory(test) enable_testing() add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test) -endif(ENABLE_TESTS) +endif()