X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=22612b91d05e59378fd96df74238f4759194a24a;hb=226a15274c4b0f3374bed48c0c4684484762ccf5;hp=0ea69f06624d296999106fc0ff4ef16773e2b505;hpb=ab186d22b223c95810bdd603db55568a14ba5de8;p=pulseview.git diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0ea69f0..22612b9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,36 +18,10 @@ ## along with this program. If not, see . ## -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) - -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 filesystem system thread_win32 unit_test_framework REQUIRED) -else() - find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED) -endif() - - -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 @@ -55,11 +29,6 @@ set(pulseview_TEST_SOURCES ${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 @@ -68,6 +37,7 @@ set(pulseview_TEST_SOURCES ${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,28 +61,29 @@ 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/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/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) @@ -130,41 +101,23 @@ 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() -qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}) - -if(ENABLE_DECODE) - add_definitions(-DENABLE_DECODE) +if(Qt5Core_FOUND) + qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}) +else() + qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}) + include(${QT_USE_FILE}) 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( - ${Boost_INCLUDE_DIRS} - ${PKGDEPS_INCLUDE_DIRS} -) - -set(PULSEVIEW_LINK_LIBS - ${Boost_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ${PKGDEPS_LIBRARIES} - ${QT_LIBRARIES} -) - -if(WIN32) - # Workaround for a MinGW linking issue. - list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") + add_definitions(-DBOOST_TEST_DYN_LINK) endif() add_executable(pulseview-test