X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=6fa08273ef73ed8d865d971b4e1da42d8784c722;hp=2448a32f3e00229897925fac339ef90bfe479586;hb=728fcafc9897d3ffb4a109b6248d88b0945128f5;hpb=075fb4995aaaf521502571d26da62a6923555eff diff --git a/CMakeLists.txt b/CMakeLists.txt index 2448a32f..6fa08273 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) @@ -27,37 +32,58 @@ project(pulseview) #= User Options #------------------------------------------------------------------------------- +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 sigrok libraries" FALSE) +option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" 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 + # 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 ) -# On Windows/MinGW we explicitly point cmake to the Boost directory. -if(WIN32) - set(BOOST_ROOT /usr/local) -endif(WIN32) +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_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED) + +# 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.42 COMPONENTS system thread_win32 REQUIRED) +else() +find_package(Boost 1.42 COMPONENTS system thread REQUIRED) +endif() #=============================================================================== #= Config Header #------------------------------------------------------------------------------- +set(PV_TITLE PulseView) +set(PV_DESCRIPTION "A GUI for sigrok") + set(PV_VERSION_MAJOR 0) set(PV_VERSION_MINOR 1) set(PV_VERSION_MICRO 0) @@ -76,47 +102,85 @@ configure_file ( set(pulseview_SOURCES main.cpp - pv/about.cpp - pv/datasnapshot.cpp - pv/logicdata.cpp - pv/logicdatasnapshot.cpp - pv/logicsignal.cpp + pv/devicemanager.cpp pv/mainwindow.cpp - pv/samplingbar.cpp - pv/signaldata.cpp pv/sigsession.cpp - pv/signal.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/connect.cpp + pv/dialogs/decoder.cpp + pv/dialogs/deviceoptions.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/decoderoptions.cpp + pv/prop/binding/deviceoptions.cpp + pv/toolbars/contextbar.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/view.cpp pv/view/viewport.cpp + pv/view/decode/annotation.cpp + pv/widgets/popup.cpp ) +# This list includes only QObject derrived class headers set(pulseview_HEADERS - pv/about.h pv/mainwindow.h - pv/samplingbar.h pv/sigsession.h + pv/data/decoder.h + pv/dialogs/about.h + pv/dialogs/connect.h + pv/dialogs/deviceoptions.h + pv/toolbars/contextbar.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 ) set(pulseview_FORMS - pv/about.ui + pv/dialogs/about.ui ) set(pulseview_RESOURCES pulseview.qrc ) -set(pulseview_TEST_SOURCES - pv/datasnapshot.cpp - pv/logicdatasnapshot.cpp - test/logicdatasnapshot.cpp - test/test.cpp -) +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}) @@ -129,6 +193,11 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) +add_definitions(-Wall -Wextra) + +if(NOT DISABLE_WERROR) + add_definitions(-Werror) +endif() #=============================================================================== #= Global Include Directories @@ -136,6 +205,7 @@ add_definitions(${QT_DEFINITIONS}) include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ) @@ -153,6 +223,7 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ) @@ -164,36 +235,53 @@ else() list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES}) endif() -add_executable(pulseview +add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} ${pulseview_FORMS_HEADERS} ${pulseview_RESOURCES_RCC} ) -target_link_libraries(pulseview ${PULSEVIEW_LINK_LIBS}) +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(PROGRAMS pulseview DESTINATION bin/) +# Install the executable. +install(TARGETS ${PROJECT_NAME} DESTINATION bin/) + +# Install the manpage. +install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) #=============================================================================== -#= Tests +#= Packaging (handled by CPack) #------------------------------------------------------------------------------- -if(ENABLE_TESTS) - - add_definitions(-DBOOST_TEST_DYN_LINK) +set(CPACK_PACKAGE_VERSION_MAJOR ${PV_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${PV_VERSION_MINOR}) +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") - add_executable(pulseview-test - ${pulseview_TEST_SOURCES} - ) +include(CPack) - target_link_libraries(pulseview-test ${PULSEVIEW_LINK_LIBS}) +#=============================================================================== +#= Tests +#------------------------------------------------------------------------------- +if(ENABLE_TESTS) + add_subdirectory(test) enable_testing() - add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test) - + add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test) endif(ENABLE_TESTS)