X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=7c454c027a1f89a2bb9e8b155025e6850b755308;hp=66dd7e51d3702721b9f757729dfea0fc8dc4dfda;hb=2b81ae4682ade4109ffa442794de36ceb32045eb;hpb=ae2d1bc5b5aba9fcdd7fef42ef1bc9069267d6f7 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 66dd7e51..7c454c02 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,27 +20,26 @@ option(ENABLE_DECODE "Build with libsigrokdecode" FALSE) -list(APPEND PKGDEPS libsigrok>=0.2.0) +list(APPEND PKGDEPS libsigrok>=0.3.0) if(ENABLE_DECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.2.0) + list(APPEND PKGDEPS libsigrokdecode>=0.3.0) endif() find_package(PkgConfig) pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) -# 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 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 unit_test_framework REQUIRED) + find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 unit_test_framework REQUIRED) else() - find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED) + find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework 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. +find_package(Threads REQUIRED) find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) find_package(Qt4 REQUIRED) @@ -48,26 +47,23 @@ find_package(Qt4 REQUIRED) set(pulseview_TEST_SOURCES ${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp ${PROJECT_SOURCE_DIR}/pv/sigsession.cpp + ${PROJECT_SOURCE_DIR}/pv/util.cpp ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp ${PROJECT_SOURCE_DIR}/pv/data/analog.cpp ${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp - ${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp - ${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp ${PROJECT_SOURCE_DIR}/pv/data/logic.cpp ${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp ${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp ${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp - ${PROJECT_SOURCE_DIR}/pv/device/device.cpp - ${PROJECT_SOURCE_DIR}/pv/device/devinst.cpp - ${PROJECT_SOURCE_DIR}/pv/device/file.cpp - ${PROJECT_SOURCE_DIR}/pv/device/inputfile.cpp - ${PROJECT_SOURCE_DIR}/pv/device/sessionfile.cpp + ${PROJECT_SOURCE_DIR}/pv/prop/double.cpp + ${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp ${PROJECT_SOURCE_DIR}/pv/prop/int.cpp ${PROJECT_SOURCE_DIR}/pv/prop/property.cpp ${PROJECT_SOURCE_DIR}/pv/prop/string.cpp ${PROJECT_SOURCE_DIR}/pv/prop/binding/binding.cpp ${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp ${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp + ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.cpp ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp ${PROJECT_SOURCE_DIR}/pv/view/header.cpp ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp @@ -91,33 +87,38 @@ set(pulseview_TEST_SOURCES # This list includes only QObject derived class headers. set(pulseview_TEST_HEADERS - ${PROJECT_SOURCE_DIR}/pv/sigsession.h - ${PROJECT_SOURCE_DIR}/pv/device/devinst.h - ${PROJECT_SOURCE_DIR}/pv/prop/int.h - ${PROJECT_SOURCE_DIR}/pv/prop/property.h - ${PROJECT_SOURCE_DIR}/pv/prop/string.h - ${PROJECT_SOURCE_DIR}/pv/view/cursor.h - ${PROJECT_SOURCE_DIR}/pv/view/header.h - ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h - ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h - ${PROJECT_SOURCE_DIR}/pv/view/ruler.h - ${PROJECT_SOURCE_DIR}/pv/view/selectableitem.h - ${PROJECT_SOURCE_DIR}/pv/view/signal.h - ${PROJECT_SOURCE_DIR}/pv/view/timemarker.h - ${PROJECT_SOURCE_DIR}/pv/view/trace.h - ${PROJECT_SOURCE_DIR}/pv/view/view.h - ${PROJECT_SOURCE_DIR}/pv/view/viewport.h - ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.h - ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.h - ${PROJECT_SOURCE_DIR}/pv/widgets/popup.h - ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h + ${PROJECT_SOURCE_DIR}/pv/sigsession.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/double.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/enum.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/int.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/property.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/string.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.hpp + ${PROJECT_SOURCE_DIR}/pv/view/cursor.hpp + ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.hpp + ${PROJECT_SOURCE_DIR}/pv/view/header.hpp + ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.hpp + ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.hpp + ${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp + ${PROJECT_SOURCE_DIR}/pv/view/selectableitem.hpp + ${PROJECT_SOURCE_DIR}/pv/view/signal.hpp + ${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp + ${PROJECT_SOURCE_DIR}/pv/view/trace.hpp + ${PROJECT_SOURCE_DIR}/pv/view/view.hpp + ${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp ) if(ENABLE_DECODE) list(APPEND pulseview_TEST_SOURCES ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp - ${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp ${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp + ${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp + ${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp + ${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp ${PROJECT_SOURCE_DIR}/pv/prop/binding/decoderoptions.cpp ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp @@ -126,10 +127,10 @@ if(ENABLE_DECODE) ) list(APPEND pulseview_TEST_HEADERS - ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.h - ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h - ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.h - ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h + ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.hpp + ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp ) endif() @@ -141,7 +142,7 @@ endif() # On MinGW we need to use static linking. if(NOT WIN32) -add_definitions(-DBOOST_TEST_DYN_LINK) + add_definitions(-DBOOST_TEST_DYN_LINK) endif() add_definitions(${QT_DEFINITIONS}) @@ -153,9 +154,9 @@ include_directories( set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${PKGDEPS_LIBRARIES} ${QT_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ) if(WIN32)