projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Factored out DecoderMenu
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index 9579d8de4413acb66e604c2f00c2dc6d6996f791..afe26a16fd8a24f772663480302258f7d0cc196b 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-30,9
+30,9
@@
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_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
find_package(Qt4 REQUIRED)
set(pulseview_TEST_SOURCES
find_package(Qt4 REQUIRED)
set(pulseview_TEST_SOURCES
@@
-46,10
+46,15
@@
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
- ${PROJECT_SOURCE_DIR}/pv/view/decode
signal
.cpp
+ ${PROJECT_SOURCE_DIR}/pv/view/decode
trace
.cpp
${PROJECT_SOURCE_DIR}/pv/view/header.cpp
${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
${PROJECT_SOURCE_DIR}/pv/view/header.cpp
${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
@@
-64,6
+69,7
@@
set(pulseview_TEST_SOURCES
${PROJECT_SOURCE_DIR}/pv/view/decode/annotation.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
${PROJECT_SOURCE_DIR}/pv/view/decode/annotation.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.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
${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
data/analogsnapshot.cpp
@@
-76,8
+82,11
@@
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/cursor.h
- ${PROJECT_SOURCE_DIR}/pv/view/decode
signal
.h
+ ${PROJECT_SOURCE_DIR}/pv/view/decode
trace
.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/header.h
${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h
${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h
@@
-90,6
+99,7
@@
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/view/viewport.h
${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.h
${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.h
+ ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h
${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
)
${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
)