projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::data::Logic: Renamed get_num_channels and fixed return types
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index 61b9c4d505b4ebaf1e4a59a34fdd7af7d367a739..91b85320bc7262601bc4ac97e7b8f3f5d364fd13 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-24,7
+24,7
@@
set(pulseview_TEST_SOURCES
${PROJECT_SOURCE_DIR}/pv/storesession.cpp
${PROJECT_SOURCE_DIR}/pv/util.cpp
${PROJECT_SOURCE_DIR}/pv/binding/binding.cpp
${PROJECT_SOURCE_DIR}/pv/storesession.cpp
${PROJECT_SOURCE_DIR}/pv/util.cpp
${PROJECT_SOURCE_DIR}/pv/binding/binding.cpp
- ${PROJECT_SOURCE_DIR}/pv/binding/device
options
.cpp
+ ${PROJECT_SOURCE_DIR}/pv/binding/device.cpp
${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
${PROJECT_SOURCE_DIR}/pv/data/analogsegment.cpp
${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
${PROJECT_SOURCE_DIR}/pv/data/analogsegment.cpp
${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
@@
-74,7
+74,7
@@
set(pulseview_TEST_SOURCES
set(pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/session.hpp
${PROJECT_SOURCE_DIR}/pv/storesession.hpp
set(pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/session.hpp
${PROJECT_SOURCE_DIR}/pv/storesession.hpp
- ${PROJECT_SOURCE_DIR}/pv/binding/device
options
.hpp
+ ${PROJECT_SOURCE_DIR}/pv/binding/device.hpp
${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
@@
-109,7
+109,7
@@
set(pulseview_TEST_HEADERS
if(ENABLE_DECODE)
list(APPEND pulseview_TEST_SOURCES
if(ENABLE_DECODE)
list(APPEND pulseview_TEST_SOURCES
- ${PROJECT_SOURCE_DIR}/pv/binding/decoder
options
.cpp
+ ${PROJECT_SOURCE_DIR}/pv/binding/decoder.cpp
${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
@@
-132,7
+132,10
@@
endif()
if(Qt5Core_FOUND)
qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
else()
if(Qt5Core_FOUND)
qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
else()
- qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
+ # Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+ # https://bugreports.qt.io/browse/QTBUG-22829
+ qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}
+ OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
include(${QT_USE_FILE})
endif()
include(${QT_USE_FILE})
endif()