X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=13bb6dd6aa1c14c56526204a0c3a657f7911b982;hp=f167ffb1e09c8db14019340a1a6cf44541254efb;hb=8f717aa7b150769d75562a2328cab5b556f7b585;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f167ffb1..13bb6dd6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,45 +18,47 @@ ## along with this program. If not, see . ## -list(APPEND PKGDEPS - libsigrok>=0.2.0 - libsigrokdecode>=0.2.0 -) +option(ENABLE_DECODE "Build with libsigrokdecode" FALSE) + +list(APPEND PKGDEPS libsigrok>=0.3.0) + +if(ENABLE_DECODE) + 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) +find_package(Boost 1.42 COMPONENTS filesystem system unit_test_framework REQUIRED) -find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED) +# 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_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) 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/decoderstack.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/data/decode/decoder.cpp - ${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.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/prop/binding/decoderoptions.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/decodetrace.cpp ${PROJECT_SOURCE_DIR}/pv/view/header.cpp ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp @@ -70,25 +72,24 @@ set(pulseview_TEST_SOURCES ${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp - ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp - ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp data/analogsnapshot.cpp - data/decoderstack.cpp data/logicsnapshot.cpp test.cpp ) -# This list includes only QObject derrived class headers +# This list includes only QObject derived class headers. set(pulseview_TEST_HEADERS ${PROJECT_SOURCE_DIR}/pv/sigsession.h - ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.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 + ${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.h ${PROJECT_SOURCE_DIR}/pv/view/cursor.h - ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h + ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.h ${PROJECT_SOURCE_DIR}/pv/view/header.h ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h @@ -101,15 +102,43 @@ set(pulseview_TEST_HEADERS ${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/decodergroupbox.h - ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h ${PROJECT_SOURCE_DIR}/pv/widgets/popup.h ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h ) +if(ENABLE_DECODE) + list(APPEND pulseview_TEST_SOURCES + ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.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 + ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp + data/decoderstack.cpp + ) + + 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 + ) +endif() + qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}) -add_definitions(-DBOOST_TEST_DYN_LINK) +if(ENABLE_DECODE) + add_definitions(-DENABLE_DECODE) +endif() + +# On MinGW we need to use static linking. +if(NOT WIN32) + add_definitions(-DBOOST_TEST_DYN_LINK) +endif() + add_definitions(${QT_DEFINITIONS}) include_directories( @@ -119,11 +148,16 @@ include_directories( set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${PKGDEPS_LIBRARIES} ${QT_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ) +if(WIN32) + # Workaround for a MinGW linking issue. + list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") +endif() + add_executable(pulseview-test ${pulseview_TEST_SOURCES} ${pulseview_TEST_HEADERS_MOC}