projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
StoreSession: Removed commented code
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index adbb55eb76e59430cefd255c37c0951a31dffa49..13bb6dd6aa1c14c56526204a0c3a657f7911b982 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-31,6
+31,10
@@
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
find_package(Boost 1.42 COMPONENTS filesystem system unit_test_framework REQUIRED)
find_package(Boost 1.42 COMPONENTS filesystem system unit_test_framework REQUIRED)
+# Find the platform's thread library (needed for C++11 threads).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads 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)
@@
-45,11
+49,6
@@
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/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/double.cpp
${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
@@
-83,12
+82,12
@@
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/double.h
${PROJECT_SOURCE_DIR}/pv/prop/enum.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/double.h
${PROJECT_SOURCE_DIR}/pv/prop/enum.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/binding/deviceoptions.h
${PROJECT_SOURCE_DIR}/pv/view/cursor.h
${PROJECT_SOURCE_DIR}/pv/view/cursorheader.h
${PROJECT_SOURCE_DIR}/pv/view/header.h
${PROJECT_SOURCE_DIR}/pv/view/cursor.h
${PROJECT_SOURCE_DIR}/pv/view/cursorheader.h
${PROJECT_SOURCE_DIR}/pv/view/header.h
@@
-137,7
+136,7
@@
endif()
# On MinGW we need to use static linking.
if(NOT WIN32)
# 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})
endif()
add_definitions(${QT_DEFINITIONS})
@@
-151,6
+150,7
@@
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
)
if(WIN32)
)
if(WIN32)