projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use boost::filesystem::path to get the filename from a path
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index ba1cce29c35099b0e05c552e1ce6342a7711d3db..98d8619c0b13c7515d23dbca751751e7b6d9d14b 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-36,9
+36,9
@@
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*).
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 system thread_win32 unit_test_framework REQUIRED)
+ find_package(Boost 1.42 COMPONENTS
filesystem
system thread_win32 unit_test_framework REQUIRED)
else()
else()
- find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED)
+ find_package(Boost 1.42 COMPONENTS
filesystem
system thread unit_test_framework REQUIRED)
endif()
endif()
@@
-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
@@
-131,7
+139,11
@@
if(ENABLE_DECODE)
add_definitions(-DENABLE_DECODE)
endif()
add_definitions(-DENABLE_DECODE)
endif()
+# 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})
include_directories(
add_definitions(${QT_DEFINITIONS})
include_directories(
@@
-146,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}