X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=036946c360984204b0dc7b8ec59abe9ed495831c;hp=5c66e4e6bb2bc6fb5fc17489e1f8696291229226;hb=88fc05658247e71b8a3bfa8871d74bf923026f73;hpb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c66e4e6..036946c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,10 +23,10 @@ cmake_minimum_required(VERSION 2.8.6) include(FindPkgConfig) include(GNUInstallDirs) -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") - project(pulseview) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") + #=============================================================================== #= User Options #------------------------------------------------------------------------------- @@ -34,42 +34,79 @@ 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 (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() 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) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Choose the type of build (None, Debug, Release, RelWithDebInfo, MinSizeRel)." + FORCE) endif() #=============================================================================== #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrok>=0.3.0) +list(APPEND PKGDEPS libsigrokxx>=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) +if(FORCE_QT4) + set(Qt5Core_FOUND FALSE) +else() + find_package(Qt5Core QUIET) +endif() -find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED) +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) +endif() + +if(ENABLE_TESTS) + find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED) +else() + find_package(Boost 1.42 COMPONENTS filesystem system thread 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. +find_package(Threads REQUIRED) #=============================================================================== #= System Introspection @@ -103,27 +140,23 @@ configure_file ( set(pulseview_SOURCES main.cpp + pv/application.cpp pv/devicemanager.cpp pv/mainwindow.cpp - pv/sigsession.cpp + pv/session.cpp pv/storesession.cpp pv/util.cpp pv/data/analog.cpp - pv/data/analogsnapshot.cpp + pv/data/analogsegment.cpp pv/data/logic.cpp - pv/data/logicsnapshot.cpp + pv/data/logicsegment.cpp pv/data/signaldata.cpp - pv/data/snapshot.cpp - pv/device/device.cpp - pv/device/file.cpp - pv/device/devinst.cpp - pv/device/inputfile.cpp - pv/device/sessionfile.cpp + pv/data/segment.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 @@ -135,15 +168,21 @@ set(pulseview_SOURCES pv/toolbars/samplingbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp + pv/view/cursorheader.cpp pv/view/cursorpair.cpp pv/view/header.cpp pv/view/marginwidget.cpp pv/view/logicsignal.cpp + pv/view/rowitem.cpp + pv/view/rowitemowner.cpp + pv/view/rowitempaintparams.cpp pv/view/ruler.cpp pv/view/selectableitem.cpp pv/view/signal.cpp + pv/view/timeitem.cpp pv/view/timemarker.cpp pv/view/trace.cpp + pv/view/tracegroup.cpp pv/view/tracepalette.cpp pv/view/view.cpp pv/view/viewport.cpp @@ -157,39 +196,43 @@ set(pulseview_SOURCES # This list includes only QObject derived class headers. set(pulseview_HEADERS - pv/mainwindow.h - pv/sigsession.h - pv/storesession.h - pv/device/devinst.h - pv/dialogs/about.h - pv/dialogs/connect.h - pv/dialogs/storeprogress.h - pv/popups/probes.h - pv/popups/deviceoptions.h - pv/prop/bool.h - pv/prop/double.h - pv/prop/enum.h - pv/prop/int.h - pv/prop/property.h - pv/prop/string.h - pv/toolbars/samplingbar.h - pv/view/cursor.h - pv/view/header.h - pv/view/logicsignal.h - pv/view/marginwidget.h - pv/view/ruler.h - pv/view/selectableitem.h - pv/view/signal.h - pv/view/timemarker.h - pv/view/trace.h - pv/view/view.h - pv/view/viewport.h - pv/widgets/colourbutton.h - pv/widgets/colourpopup.h - pv/widgets/popup.h - pv/widgets/popuptoolbutton.h - pv/widgets/sweeptimingwidget.h - pv/widgets/wellarray.h + pv/mainwindow.hpp + pv/session.hpp + pv/storesession.hpp + pv/dialogs/about.hpp + pv/dialogs/connect.hpp + pv/dialogs/storeprogress.hpp + pv/popups/channels.hpp + pv/popups/deviceoptions.hpp + pv/prop/bool.hpp + pv/prop/double.hpp + pv/prop/enum.hpp + pv/prop/int.hpp + pv/prop/property.hpp + pv/prop/string.hpp + pv/prop/binding/deviceoptions.hpp + pv/toolbars/samplingbar.hpp + pv/view/cursor.hpp + pv/view/cursorheader.hpp + pv/view/header.hpp + pv/view/logicsignal.hpp + pv/view/marginwidget.hpp + pv/view/rowitem.hpp + pv/view/ruler.hpp + pv/view/selectableitem.hpp + pv/view/signal.hpp + pv/view/timeitem.hpp + pv/view/timemarker.hpp + pv/view/trace.hpp + pv/view/tracegroup.hpp + pv/view/view.hpp + pv/view/viewport.hpp + pv/widgets/colourbutton.hpp + pv/widgets/colourpopup.hpp + pv/widgets/popup.hpp + pv/widgets/popuptoolbutton.hpp + pv/widgets/sweeptimingwidget.hpp + pv/widgets/wellarray.hpp ) set(pulseview_FORMS @@ -202,7 +245,7 @@ set(pulseview_RESOURCES if(ENABLE_SIGNALS) list(APPEND pulseview_SOURCES signalhandler.cpp) - list(APPEND pulseview_HEADERS signalhandler.h) + list(APPEND pulseview_HEADERS signalhandler.hpp) endif() if(ENABLE_DECODE) @@ -219,10 +262,10 @@ if(ENABLE_DECODE) ) list(APPEND pulseview_HEADERS - pv/data/decoderstack.h - pv/view/decodetrace.h - pv/widgets/decodergroupbox.h - pv/widgets/decodermenu.h + pv/data/decoderstack.hpp + pv/view/decodetrace.hpp + pv/widgets/decodergroupbox.hpp + pv/widgets/decodermenu.hpp ) endif() @@ -233,17 +276,26 @@ if(WIN32) list(APPEND pulseview_SOURCES pulseviewico.rc) 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(ANDROID) + list(APPEND pulseview_SOURCES android/loghandler.cpp) +endif() -include(${QT_USE_FILE}) +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) @@ -256,6 +308,10 @@ if(NOT DISABLE_WERROR) add_definitions(-Werror) endif() +if(ENABLE_SIGNALS) + add_definitions(-DENABLE_SIGNALS) +endif() + #=============================================================================== #= Global Include Directories #------------------------------------------------------------------------------- @@ -264,6 +320,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} ) if(STATIC_PKGDEPS_LIBS) @@ -281,6 +338,7 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} ${QT_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ) if(STATIC_PKGDEPS_LIBS) @@ -300,16 +358,29 @@ if(WIN32) # 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") + list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY}) +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}) @@ -318,11 +389,6 @@ if(WIN32) set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows") endif() -if(ENABLE_COTIRE) - include(cotire) - cotire(${PROJECT_NAME}) -endif() - #=============================================================================== #= Installation #-------------------------------------------------------------------------------