X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=5072c4521be4fdf80f0b7458614263335e7bf90f;hp=ebe156d56e5dc902480bbeff3794ba4ab7d831e3;hb=e563a7c0fd19cc3fd4ef114cf58dff249a33255f;hpb=3933e8a901740de80133f15daf3d114867c08e0c diff --git a/CMakeLists.txt b/CMakeLists.txt index ebe156d5..5072c452 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -## + ## This file is part of the PulseView project. ## ## Copyright (C) 2012 Joel Holdsworth @@ -18,8 +18,13 @@ ## along with this program. If not, see . ## -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.6) + include(FindPkgConfig) +include(GNUInstallDirs) + +set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") +include(cotire) project(pulseview) @@ -28,6 +33,7 @@ project(pulseview) #------------------------------------------------------------------------------- option(DISABLE_WERROR "Build without -Werror" FALSE) +option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE) @@ -39,18 +45,24 @@ if(WIN32) # 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 + set(ENABLE_SIGNALS FALSE) endif() #=============================================================================== #= Dependencies #------------------------------------------------------------------------------- -find_package(PkgConfig) -pkg_check_modules(PKGDEPS REQUIRED - libsigrokdecode>=0.1.0 +list(APPEND PKGDEPS libsigrok>=0.2.0 + libsigrokdecode>=0.2.0 ) +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). @@ -60,9 +72,9 @@ 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) +find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED) else() -find_package(Boost 1.42 COMPONENTS system thread) +find_package(Boost 1.42 COMPONENTS system thread REQUIRED) endif() #=============================================================================== @@ -90,43 +102,89 @@ configure_file ( set(pulseview_SOURCES main.cpp + pv/devicemanager.cpp pv/mainwindow.cpp - pv/samplingbar.cpp pv/sigsession.cpp pv/data/analog.cpp pv/data/analogsnapshot.cpp + pv/data/decoderstack.cpp pv/data/logic.cpp pv/data/logicsnapshot.cpp pv/data/signaldata.cpp pv/data/snapshot.cpp + pv/data/decode/decoder.cpp pv/dialogs/about.cpp - pv/dialogs/hwcap.cpp + pv/dialogs/connect.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/hwcap.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/decodetrace.cpp pv/view/header.cpp + pv/view/marginwidget.cpp pv/view/logicsignal.cpp pv/view/ruler.cpp + pv/view/selectableitem.cpp 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/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/wellarray.cpp ) +# This list includes only QObject derrived class headers set(pulseview_HEADERS pv/mainwindow.h - pv/samplingbar.h pv/sigsession.h + pv/data/decoderstack.h pv/dialogs/about.h + pv/dialogs/connect.h + pv/popups/deviceoptions.h + pv/popups/probes.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/decodetrace.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/decodermenu.h + pv/widgets/popup.h + pv/widgets/popuptoolbutton.h + pv/widgets/wellarray.h ) set(pulseview_FORMS @@ -137,6 +195,11 @@ set(pulseview_RESOURCES pulseview.qrc ) +if(ENABLE_SIGNALS) + list(APPEND pulseview_SOURCES signalhandler.cpp) + 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}) @@ -148,7 +211,7 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) -add_definitions(-Wextra) +add_definitions(-Wall -Wextra) if(NOT DISABLE_WERROR) add_definitions(-Werror) @@ -198,13 +261,23 @@ 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") +endif() #=============================================================================== #= Installation #------------------------------------------------------------------------------- +# Install the executable. install(TARGETS ${PROJECT_NAME} DESTINATION bin/) +# Install the manpage. +install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) + #=============================================================================== #= Packaging (handled by CPack) #-------------------------------------------------------------------------------