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 filesystem system thread_win32 unit_test_framework REQUIRED)
-else()
- find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
-endif()
+find_package(Boost 1.42 COMPONENTS filesystem system 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_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/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
# 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/prop/binding/deviceoptions.h
${PROJECT_SOURCE_DIR}/pv/view/cursor.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
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
# 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})
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
)
if(WIN32)