projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved decoder config into the popup
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index e0f4fce7db8b9ca9eb0e0d4a6c6be1946b6cd71c..e55e20dea9cfc53dcc909d72657dd13e06fc001b 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-30,7
+30,7
@@
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
find_package(Threads)
# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
find_package(Threads)
-find_package(Boost 1.4
6
COMPONENTS system thread unit_test_framework REQUIRED)
+find_package(Boost 1.4
2
COMPONENTS system thread unit_test_framework REQUIRED)
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
find_package(Qt4 REQUIRED)
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
find_package(Qt4 REQUIRED)
@@
-46,6
+46,11
@@
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/data/logicsnapshot.cpp
${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
${PROJECT_SOURCE_DIR}/pv/data/signaldata.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/cursorpair.cpp
${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
@@
-76,6
+81,9
@@
set(pulseview_TEST_SOURCES
set(pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/sigsession.h
${PROJECT_SOURCE_DIR}/pv/data/decoder.h
set(pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/sigsession.h
${PROJECT_SOURCE_DIR}/pv/data/decoder.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/decodesignal.h
${PROJECT_SOURCE_DIR}/pv/view/header.h
${PROJECT_SOURCE_DIR}/pv/view/cursor.h
${PROJECT_SOURCE_DIR}/pv/view/decodesignal.h
${PROJECT_SOURCE_DIR}/pv/view/header.h