X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=8c18ad7e254e526fb470a2621cba6be7b7d39f41;hp=c6459353b62a63f19e757e10e93075961217cd6a;hb=d37583678256450d7eb646213d0b9e170a427933;hpb=cef18fc6160f8f5055f2617fbe06eb082c2a7bd5 diff --git a/CMakeLists.txt b/CMakeLists.txt index c6459353..8c18ad7e 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,13 +27,18 @@ project(pulseview) #= User Options #------------------------------------------------------------------------------- +option(DISABLE_WERROR "Build without -Werror" FALSE) 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) endif() #=============================================================================== @@ -46,18 +51,27 @@ pkg_check_modules(PKGDEPS REQUIRED libsigrok>=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(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,48 +90,57 @@ configure_file ( set(pulseview_SOURCES main.cpp - pv/about.cpp - pv/datasnapshot.cpp - pv/logicdata.cpp - pv/logicdatasnapshot.cpp - pv/logicsignal.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/logic.cpp + pv/data/logicsnapshot.cpp + pv/data/signaldata.cpp + pv/data/snapshot.cpp + pv/dialogs/about.cpp + pv/dialogs/connect.cpp + pv/dialogs/deviceoptions.cpp + pv/prop/double.cpp + pv/prop/enum.cpp + pv/prop/property.cpp + pv/prop/binding/binding.cpp + pv/prop/binding/deviceoptions.cpp + pv/view/analogsignal.cpp + pv/view/cursor.cpp pv/view/header.cpp + pv/view/logicsignal.cpp pv/view/ruler.cpp + pv/view/signal.cpp + pv/view/timemarker.cpp pv/view/view.cpp pv/view/viewport.cpp ) set(pulseview_HEADERS - pv/about.h pv/mainwindow.h pv/samplingbar.h pv/sigsession.h + pv/dialogs/about.h + pv/dialogs/connect.h + pv/dialogs/deviceoptions.h + pv/view/cursor.h pv/view/header.h pv/view/ruler.h + pv/view/timemarker.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 -) - qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) @@ -129,6 +152,11 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) +add_definitions(-Wall -Wextra) + +if(NOT DISABLE_WERROR) + add_definitions(-Werror) +endif() #=============================================================================== #= Global Include Directories @@ -154,6 +182,7 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ) @@ -165,36 +194,43 @@ 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}) #=============================================================================== #= Installation #------------------------------------------------------------------------------- -install(PROGRAMS pulseview DESTINATION bin/) +install(TARGETS ${PROJECT_NAME} DESTINATION bin/) #=============================================================================== -#= 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)