projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved session creation into DevInst objects
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index 57ca26f0026de927c6fb60a0c77e3fd2271ed415..66dd7e51d3702721b9f757729dfea0fc8dc4dfda 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-51,10
+51,17
@@
set(pulseview_TEST_SOURCES
${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/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/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/int.cpp
${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
@@
-85,6
+92,7
@@
set(pulseview_TEST_SOURCES
# This list includes only QObject derived class headers.
set(pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/sigsession.h
# 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/int.h
${PROJECT_SOURCE_DIR}/pv/prop/property.h
${PROJECT_SOURCE_DIR}/pv/prop/string.h
${PROJECT_SOURCE_DIR}/pv/prop/int.h
${PROJECT_SOURCE_DIR}/pv/prop/property.h
${PROJECT_SOURCE_DIR}/pv/prop/string.h
@@
-150,6
+158,11
@@
set(PULSEVIEW_LINK_LIBS
${QT_LIBRARIES}
)
${QT_LIBRARIES}
)
+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}
add_executable(pulseview-test
${pulseview_TEST_SOURCES}
${pulseview_TEST_HEADERS_MOC}