X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=2ba907af96be14167535429551873a751d639c04;hp=a5a910456e8b5c053b92bd10da576dd78fde247e;hb=1198b8872516662c257e5dcdec346094ed4f32dd;hpb=7ba41e7ec7e575ae34ed2af33920c6e843aaac4d diff --git a/CMakeLists.txt b/CMakeLists.txt index a5a91045..2ba907af 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,9 +33,10 @@ project(pulseview) option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) -option(ENABLE_SIGROKDECODE "Build with libsigrokdecode" FALSE) +option(ENABLE_DECODE "Build with libsigrokdecode" FALSE) +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) if(WIN32) # On Windows/MinGW we need to statically link to libraries. @@ -44,10 +44,10 @@ if(WIN32) set(STATIC_PKGDEPS_LIBS TRUE) # For boost-thread we need two additional settings on win32: - set(Boost_USE_STATIC_LIBS on) + 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() @@ -55,18 +55,16 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS - libsigrok>=0.2.0 -) +list(APPEND PKGDEPS libsigrok>=0.2.0) -if(ENABLE_SIGROKDECODE) +if(ENABLE_DECODE) list(APPEND PKGDEPS libsigrokdecode>=0.2.0) endif() find_package(PkgConfig) pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) +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). @@ -74,11 +72,11 @@ find_package(Qt4 REQUIRED) find_package(Threads) 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) + # On Windows/MinGW 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) else() -find_package(Boost 1.42 COMPONENTS system thread REQUIRED) + find_package(Boost 1.42 COMPONENTS system thread REQUIRED) endif() #=============================================================================== @@ -109,6 +107,7 @@ set(pulseview_SOURCES pv/devicemanager.cpp pv/mainwindow.cpp pv/sigsession.cpp + pv/storesession.cpp pv/data/analog.cpp pv/data/analogsnapshot.cpp pv/data/logic.cpp @@ -117,15 +116,17 @@ set(pulseview_SOURCES pv/data/snapshot.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp - pv/dialogs/deviceoptions.cpp + pv/dialogs/storeprogress.cpp + pv/popups/deviceoptions.cpp + pv/popups/probes.cpp pv/prop/bool.cpp pv/prop/double.cpp pv/prop/enum.cpp pv/prop/int.cpp pv/prop/property.cpp + pv/prop/string.cpp pv/prop/binding/binding.cpp pv/prop/binding/deviceoptions.cpp - pv/toolbars/contextbar.cpp pv/toolbars/samplingbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp @@ -138,18 +139,33 @@ set(pulseview_SOURCES pv/view/signal.cpp pv/view/timemarker.cpp pv/view/trace.cpp + pv/view/tracepalette.cpp pv/view/view.cpp pv/view/viewport.cpp + pv/widgets/colourbutton.cpp + pv/widgets/colourpopup.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/storesession.h pv/dialogs/about.h pv/dialogs/connect.h - pv/dialogs/deviceoptions.h - pv/toolbars/contextbar.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 @@ -162,6 +178,12 @@ set(pulseview_HEADERS 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 ) set(pulseview_FORMS @@ -177,6 +199,32 @@ if(ENABLE_SIGNALS) list(APPEND pulseview_HEADERS signalhandler.h) endif() +if(ENABLE_DECODE) + list(APPEND pulseview_SOURCES + pv/data/decoderstack.cpp + pv/data/decode/annotation.cpp + pv/data/decode/decoder.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() + qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) @@ -188,10 +236,11 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) +add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) -if(ENABLE_SIGROKDECODE) - add_definitions(-DENABLE_SIGROKDECODE) +if(ENABLE_DECODE) + add_definitions(-DENABLE_DECODE) endif() if(NOT DISABLE_WERROR) @@ -234,6 +283,15 @@ else() 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() + add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} @@ -242,11 +300,15 @@ add_executable(${PROJECT_NAME} ) 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() #=============================================================================== @@ -283,4 +345,4 @@ if(ENABLE_TESTS) add_subdirectory(test) enable_testing() add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test) -endif(ENABLE_TESTS) +endif()