From: Alexandru Gagniuc <redacted>
Date: Sat, 13 Oct 2012 00:11:16 +0000 (-0500)
Subject: Do not pass -DBOOST_TEST_DYN_LINK to pulseview
X-Git-Tag: pulseview-0.1.0~258
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fb746bcc3d2b317e7ced838ff0f90cdf3dfe7aed;p=pulseview.git

Do not pass -DBOOST_TEST_DYN_LINK to pulseview

-DBOOST_TEST_DYN_LINK is meant to be passed only to pulseview-test,
not to pulseview. When test were enabled, this flag was defined
globally, and as a result, also passed to pulseview.

Create a CMakeLists.txt for test, and add test as a subdirectory
when tests are enabled. This way, -DBOOST_TEST_DYN_LINK is only
defined for our test app.

Signed-off-by: Alexandru Gagniuc <redacted>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d3464b7..cea8b744 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)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 00000000..363470bb
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,35 @@
+##
+## This file is part of the PulseView project.
+##
+## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+set(pulseview_TEST_SOURCES
+	${PROJECT_SOURCE_DIR}/pv/datasnapshot.cpp
+	${PROJECT_SOURCE_DIR}/pv/logicdatasnapshot.cpp
+	logicdatasnapshot.cpp
+	test.cpp
+)
+
+add_definitions(-DBOOST_TEST_DYN_LINK)
+
+add_executable(pulseview-test
+	${pulseview_TEST_SOURCES}
+)
+
+target_link_libraries(pulseview-test ${PULSEVIEW_LINK_LIBS})
+