X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=1b9c7d1a2b50fb3106a61c11e81c90df49ff87a7;hp=945b40cdad72677db556bcf58832685a404aeb8f;hb=03e8c9914eeadadd6f54aa32f55f5c08bd27c426;hpb=6a91973f74ee7360a82e107e8b2d708030498291 diff --git a/CMakeLists.txt b/CMakeLists.txt index 945b40cd..1b9c7d1a 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,8 +33,10 @@ project(pulseview) option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) +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. @@ -43,26 +44,33 @@ 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() +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.2.0) + +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). @@ -70,13 +78,20 @@ 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 filesystem system thread_win32 REQUIRED) else() -find_package(Boost 1.42 COMPONENTS system thread REQUIRED) + find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED) endif() +#=============================================================================== +#= System Introspection +#------------------------------------------------------------------------------- + +include(memaccess) +memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) + #=============================================================================== #= Config Header #------------------------------------------------------------------------------- @@ -105,17 +120,23 @@ 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/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/inputfile.cpp + pv/device/sessionfile.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp - pv/dialogs/decoder.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 @@ -123,13 +144,11 @@ 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/cursorpair.cpp - pv/view/decodesignal.cpp pv/view/header.cpp pv/view/marginwidget.cpp pv/view/logicsignal.cpp @@ -141,25 +160,33 @@ 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/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/deviceoptions.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/decodesignal.h pv/view/header.h pv/view/logicsignal.h pv/view/marginwidget.h @@ -172,7 +199,9 @@ set(pulseview_HEADERS 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 ) @@ -189,6 +218,34 @@ 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/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() + qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) @@ -200,8 +257,13 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) +add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) +if(ENABLE_DECODE) + add_definitions(-DENABLE_DECODE) +endif() + if(NOT DISABLE_WERROR) add_definitions(-Werror) endif() @@ -237,11 +299,24 @@ set(PULSEVIEW_LINK_LIBS 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() + add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} @@ -250,11 +325,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() #=============================================================================== @@ -291,4 +370,4 @@ if(ENABLE_TESTS) add_subdirectory(test) enable_testing() add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test) -endif(ENABLE_TESTS) +endif()