X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=cea8b744f7a2e67e132983da357db9366a715f46;hp=0d3464b78fb51493987539b76e5aac5eb9905a01;hb=fb746bcc3d2b317e7ced838ff0f90cdf3dfe7aed;hpb=57821103f8a0b9a77e304c94e167178d29ab0fbd

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d3464b..cea8b74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,13 +114,6 @@ set(pulseview_RESOURCES
 	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})
@@ -188,18 +181,7 @@ install(PROGRAMS ${PROJECT_NAME} DESTINATION bin/)
 #-------------------------------------------------------------------------------
 
 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()
-	add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
-
+	add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test)
 endif(ENABLE_TESTS)