X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=99314d05e8213fc9bb1e95c92fa568836169b37c;hp=8e2ac69505984c9094cf2c98d54f2dd39962d1f9;hb=0c9136370d062b08e47657e12f77518197d89339;hpb=6dcdb3258f6f0b25e69154b5919405a194b7e724 diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e2ac695..99314d05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) option(ENABLE_DECODE "Build with libsigrokdecode" TRUE) -option(ENABLE_COTIRE "Enable cotire" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE) option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE) @@ -44,21 +43,29 @@ if(WIN32) # 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) + + # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'. + # The library is named libboost_thread_win32* (not libboost_thread*). + set(Boost_THREADAPI win32) + # Windows does not support UNIX signals. set(ENABLE_SIGNALS FALSE) endif() if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." - FORCE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Choose the type of build (None, Debug, Release, RelWithDebInfo, MinSizeRel)." + FORCE) endif() #=============================================================================== #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrokxx>=0.3.0) +list(APPEND PKGDEPS libsigrokcxx>=0.3.0) if(ENABLE_DECODE) list(APPEND PKGDEPS libsigrokdecode>=0.3.0) @@ -91,7 +98,11 @@ else() find_package(Qt4 REQUIRED QtCore QtGui QtSvg) endif() -find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED) +if(ENABLE_TESTS) + find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED) +else() + find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED) +endif() # Find the platform's thread library (needed for C++11 threads). # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. @@ -132,15 +143,18 @@ set(pulseview_SOURCES pv/application.cpp pv/devicemanager.cpp pv/mainwindow.cpp - pv/sigsession.cpp + pv/session.cpp pv/storesession.cpp pv/util.cpp + pv/binding/binding.cpp + pv/binding/inputoutput.cpp + pv/binding/device.cpp pv/data/analog.cpp - pv/data/analogsnapshot.cpp + pv/data/analogsegment.cpp pv/data/logic.cpp - pv/data/logicsnapshot.cpp + pv/data/logicsegment.cpp pv/data/signaldata.cpp - pv/data/snapshot.cpp + pv/data/segment.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp pv/dialogs/storeprogress.cpp @@ -152,29 +166,33 @@ set(pulseview_SOURCES pv/prop/int.cpp pv/prop/property.cpp pv/prop/string.cpp - pv/prop/binding/binding.cpp - pv/prop/binding/deviceoptions.cpp - pv/toolbars/samplingbar.cpp + pv/toolbars/mainbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp - pv/view/cursorheader.cpp pv/view/cursorpair.cpp + pv/view/flag.cpp pv/view/header.cpp pv/view/marginwidget.cpp pv/view/logicsignal.cpp pv/view/rowitem.cpp pv/view/rowitemowner.cpp pv/view/ruler.cpp - pv/view/selectableitem.cpp pv/view/signal.cpp + pv/view/timeitem.cpp pv/view/timemarker.cpp pv/view/trace.cpp pv/view/tracegroup.cpp pv/view/tracepalette.cpp pv/view/view.cpp + pv/view/viewitem.cpp + pv/view/viewitempaintparams.cpp pv/view/viewport.cpp + pv/view/viewwidget.cpp pv/widgets/colourbutton.cpp pv/widgets/colourpopup.cpp + pv/widgets/devicetoolbutton.cpp + pv/widgets/exportmenu.cpp + pv/widgets/hidingmenubar.cpp pv/widgets/popup.cpp pv/widgets/popuptoolbutton.cpp pv/widgets/sweeptimingwidget.cpp @@ -183,42 +201,47 @@ set(pulseview_SOURCES # This list includes only QObject derived class headers. set(pulseview_HEADERS - pv/mainwindow.h - pv/sigsession.h - pv/storesession.h - pv/dialogs/about.h - pv/dialogs/connect.h - pv/dialogs/storeprogress.h - pv/popups/channels.h - pv/popups/deviceoptions.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/prop/binding/deviceoptions.h - pv/toolbars/samplingbar.h - pv/view/cursor.h - pv/view/cursorheader.h - pv/view/header.h - pv/view/logicsignal.h - pv/view/marginwidget.h - pv/view/rowitem.h - pv/view/ruler.h - pv/view/selectableitem.h - pv/view/signal.h - pv/view/timemarker.h - pv/view/trace.h - pv/view/tracegroup.h - pv/view/view.h - pv/view/viewport.h - pv/widgets/colourbutton.h - pv/widgets/colourpopup.h - pv/widgets/popup.h - pv/widgets/popuptoolbutton.h - pv/widgets/sweeptimingwidget.h - pv/widgets/wellarray.h + pv/mainwindow.hpp + pv/session.hpp + pv/storesession.hpp + pv/binding/device.hpp + pv/dialogs/about.hpp + pv/dialogs/connect.hpp + pv/dialogs/storeprogress.hpp + pv/popups/channels.hpp + pv/popups/deviceoptions.hpp + pv/prop/bool.hpp + pv/prop/double.hpp + pv/prop/enum.hpp + pv/prop/int.hpp + pv/prop/property.hpp + pv/prop/string.hpp + pv/toolbars/mainbar.hpp + pv/view/cursor.hpp + pv/view/flag.hpp + pv/view/header.hpp + pv/view/logicsignal.hpp + pv/view/marginwidget.hpp + pv/view/rowitem.hpp + pv/view/ruler.hpp + pv/view/signal.hpp + pv/view/timeitem.hpp + pv/view/timemarker.hpp + pv/view/trace.hpp + pv/view/tracegroup.hpp + pv/view/view.hpp + pv/view/viewitem.hpp + pv/view/viewport.hpp + pv/view/viewwidget.hpp + pv/widgets/colourbutton.hpp + pv/widgets/colourpopup.hpp + pv/widgets/devicetoolbutton.hpp + pv/widgets/exportmenu.hpp + pv/widgets/hidingmenubar.hpp + pv/widgets/popup.hpp + pv/widgets/popuptoolbutton.hpp + pv/widgets/sweeptimingwidget.hpp + pv/widgets/wellarray.hpp ) set(pulseview_FORMS @@ -231,27 +254,27 @@ set(pulseview_RESOURCES if(ENABLE_SIGNALS) list(APPEND pulseview_SOURCES signalhandler.cpp) - list(APPEND pulseview_HEADERS signalhandler.h) + list(APPEND pulseview_HEADERS signalhandler.hpp) endif() if(ENABLE_DECODE) list(APPEND pulseview_SOURCES + pv/binding/decoder.cpp pv/data/decoderstack.cpp pv/data/decode/annotation.cpp pv/data/decode/decoder.cpp pv/data/decode/row.cpp pv/data/decode/rowdata.cpp - pv/prop/binding/decoderoptions.cpp pv/view/decodetrace.cpp pv/widgets/decodergroupbox.cpp pv/widgets/decodermenu.cpp ) list(APPEND pulseview_HEADERS - pv/data/decoderstack.h - pv/view/decodetrace.h - pv/widgets/decodergroupbox.h - pv/widgets/decodermenu.h + pv/data/decoderstack.hpp + pv/view/decodetrace.hpp + pv/widgets/decodergroupbox.hpp + pv/widgets/decodermenu.hpp ) endif() @@ -375,11 +398,6 @@ if(WIN32) set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows") endif() -if(ENABLE_COTIRE) - include(cotire) - cotire(${PROJECT_NAME}) -endif() - #=============================================================================== #= Installation #-------------------------------------------------------------------------------