X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=2ea44dba08084bf4d3bcc15f385f3d5ea7c1f873;hp=eeaf5002fa2c35f9cc663d20325a21a2b39891f1;hb=fe89c96185dba8ccf02b6b3d0994c2e149198c73;hpb=b02a8cbf3d4d6a96732f29937f87525a823a0045 diff --git a/CMakeLists.txt b/CMakeLists.txt index eeaf5002..2ea44dba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ ## This file is part of the PulseView project. ## ## Copyright (C) 2012 Joel Holdsworth -## Copyright (C) 2012 Alexandru Gagniuc +## Copyright (C) 2012-2013 Alexandru Gagniuc ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -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) @@ -35,31 +41,40 @@ 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 + 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) -# On Windows/MinGW we explicitly point cmake to the Boost directory. -if(WIN32) - set(BOOST_ROOT /usr/local) -endif() +# 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(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.45 COMPONENTS system thread_win32) +find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED) else() -find_package(Boost 1.45 COMPONENTS system thread) +find_package(Boost 1.42 COMPONENTS system thread REQUIRED) endif() #=============================================================================== @@ -87,43 +102,86 @@ 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/decoder.cpp pv/data/logic.cpp pv/data/logicsnapshot.cpp pv/data/signaldata.cpp pv/data/snapshot.cpp pv/dialogs/about.cpp - pv/dialogs/hwcap.cpp + pv/dialogs/connect.cpp + pv/dialogs/decoder.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/decodesignal.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/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/decoder.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/decodesignal.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/popuptoolbutton.h + pv/widgets/wellarray.h ) set(pulseview_FORMS @@ -134,6 +192,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}) @@ -145,7 +208,7 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) -add_definitions(-Wextra) +add_definitions(-Wall -Wextra) if(NOT DISABLE_WERROR) add_definitions(-Werror) @@ -175,6 +238,7 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ) @@ -194,13 +258,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) #------------------------------------------------------------------------------- @@ -211,6 +285,9 @@ set(CPACK_PACKAGE_VERSION_PATCH ${PV_VERSION_MICRO}) set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README) set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING) set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git") +set(CPACK_SOURCE_PACKAGE_FILE_NAME + "${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}") +set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack)