X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=6aa6e9fb92bc6537be317cfd6a219f8d61f59322;hp=1e1716b7f512cacbf6ddd3a2199d80fef3ca5d72;hb=42a113fe1270485a0c06e22ce43860db8b48d2c3;hpb=820c3dea881d351f2bbf4e03c2302f5ca645df63 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e1716b7..6aa6e9fb 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 @@ -27,6 +27,9 @@ project(pulseview) #= User Options #------------------------------------------------------------------------------- +option(DISABLE_WERROR "Build without -Werror" FALSE) +option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) +option(ENABLE_SIGROKDECODE "Build with libsigrokdecode" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE) @@ -34,27 +37,44 @@ 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 ) +if(ENABLE_SIGROKDECODE) + list(APPEND PKGDEPS libsigrokdecode>=0.2.0) +endif() + +find_package(PkgConfig) +pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) + find_package(Qt4 REQUIRED) -# On Windows/MinGW we explicitly point cmake to the Boost directory. +# 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) - set(BOOST_ROOT /usr/local) +# 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() -find_package(Boost 1.46 COMPONENTS system thread) - #=============================================================================== #= Config Header #------------------------------------------------------------------------------- @@ -80,8 +100,8 @@ 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 @@ -90,13 +110,19 @@ set(pulseview_SOURCES pv/data/signaldata.cpp pv/data/snapshot.cpp pv/dialogs/about.cpp - pv/dialogs/hwcap.cpp + pv/dialogs/connect.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/binding/binding.cpp - pv/prop/binding/hwcap.cpp + pv/prop/binding/deviceoptions.cpp + pv/toolbars/samplingbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp + pv/view/cursorpair.cpp pv/view/header.cpp pv/view/logicsignal.cpp pv/view/ruler.cpp @@ -108,9 +134,11 @@ set(pulseview_SOURCES set(pulseview_HEADERS pv/mainwindow.h - pv/samplingbar.h pv/sigsession.h pv/dialogs/about.h + pv/dialogs/connect.h + pv/dialogs/deviceoptions.h + pv/toolbars/samplingbar.h pv/view/cursor.h pv/view/header.h pv/view/ruler.h @@ -127,6 +155,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}) @@ -138,7 +171,15 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) -add_definitions(-Werror -Wall) +add_definitions(-Wall -Wextra) + +if(ENABLE_SIGROKDECODE) + add_definitions(-DENABLE_SIGROKDECODE) +endif() + +if(NOT DISABLE_WERROR) + add_definitions(-Werror) +endif() #=============================================================================== #= Global Include Directories @@ -164,6 +205,7 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ) @@ -184,11 +226,32 @@ add_executable(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) +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 ${PROJECT_NAME} DESTINATION bin/) +install(TARGETS ${PROJECT_NAME} DESTINATION bin/) + +#=============================================================================== +#= Packaging (handled by CPack) +#------------------------------------------------------------------------------- + +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") + +include(CPack) #=============================================================================== #= Tests