X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=0ea69f06624d296999106fc0ff4ef16773e2b505;hb=ab186d22b223c95810bdd603db55568a14ba5de8;hp=66dd7e51d3702721b9f757729dfea0fc8dc4dfda;hpb=ae2d1bc5b5aba9fcdd7fef42ef1bc9069267d6f7;p=pulseview.git diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 66dd7e5..0ea69f0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,10 +20,10 @@ 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) @@ -36,9 +36,9 @@ 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() @@ -51,8 +51,6 @@ set(pulseview_TEST_SOURCES ${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 @@ -62,6 +60,8 @@ set(pulseview_TEST_SOURCES ${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 @@ -93,6 +93,8 @@ set(pulseview_TEST_SOURCES set(pulseview_TEST_HEADERS ${PROJECT_SOURCE_DIR}/pv/sigsession.h ${PROJECT_SOURCE_DIR}/pv/device/devinst.h + ${PROJECT_SOURCE_DIR}/pv/prop/double.h + ${PROJECT_SOURCE_DIR}/pv/prop/enum.h ${PROJECT_SOURCE_DIR}/pv/prop/int.h ${PROJECT_SOURCE_DIR}/pv/prop/property.h ${PROJECT_SOURCE_DIR}/pv/prop/string.h @@ -116,8 +118,10 @@ set(pulseview_TEST_HEADERS 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