projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not pass -DBOOST_TEST_DYN_LINK to pulseview
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index d1f122c416fb52116864329cfe97f218e5677259..cea8b744f7a2e67e132983da357db9366a715f46 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-59,6
+59,7
@@
find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
#-------------------------------------------------------------------------------
set(PV_TITLE PulseView)
#-------------------------------------------------------------------------------
set(PV_TITLE PulseView)
+set(PV_DESCRIPTION "A GUI for sigrok")
set(PV_VERSION_MAJOR 0)
set(PV_VERSION_MINOR 1)
set(PV_VERSION_MAJOR 0)
set(PV_VERSION_MINOR 1)
@@
-113,13
+114,6
@@
set(pulseview_RESOURCES
pulseview.qrc
)
pulseview.qrc
)
-set(pulseview_TEST_SOURCES
- pv/datasnapshot.cpp
- pv/logicdatasnapshot.cpp
- test/logicdatasnapshot.cpp
- test/test.cpp
-)
-
qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
@@
-187,18
+181,7
@@
install(PROGRAMS ${PROJECT_NAME} DESTINATION bin/)
#-------------------------------------------------------------------------------
if(ENABLE_TESTS)
#-------------------------------------------------------------------------------
if(ENABLE_TESTS)
-
- add_definitions(pulseview-tests
- -DBOOST_TEST_DYN_LINK
- )
-
- add_executable(pulseview-test
- ${pulseview_TEST_SOURCES}
- )
-
- target_link_libraries(pulseview-test ${PULSEVIEW_LINK_LIBS})
-
+ add_subdirectory(test)
enable_testing()
enable_testing()
- add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
-
+ add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test)
endif(ENABLE_TESTS)
endif(ENABLE_TESTS)