[asl] 147/177: Fixing testing

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:49 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository asl.

commit cd10e1d5f888878ff1af991897b635434744d950
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Thu Aug 13 12:46:50 2015 +0300

    Fixing testing
---
 CMakeLists.txt               | 1 +
 NEWS.md                      | 6 ++++++
 src/numExtend/CMakeLists.txt | 3 +--
 test/CMakeLists.txt          | 2 --
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e4e5a2..22c69b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ if (WITH_TESTS)
 	# Performance tests are labled "Performance"
 	# Run them: ctest [-C Release|Debug] -L Performance
 	# Exclude them: ctest [-C Release|Debug] -LE Performance
+	enable_testing()
 	add_subdirectory(test)
 endif()
 
diff --git a/NEWS.md b/NEWS.md
index 9a4d099..6bfd131 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,11 @@
 # News and ChangeLog
 
+## 0.1.6
+
+- fixing linkage issues
+- fixing testing issues
+
+
 ## 0.1.5
 
 - supplying cl.hpp, since not provided by OpenCL 2.0 (causes harmless "deprecated" warnings)
diff --git a/src/numExtend/CMakeLists.txt b/src/numExtend/CMakeLists.txt
index 67b8eb3..3271071 100644
--- a/src/numExtend/CMakeLists.txt
+++ b/src/numExtend/CMakeLists.txt
@@ -1,6 +1,5 @@
 include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/acl)
 
-
 # aslnumext
 
 set(aslnumext_PUBLIC_HEADERS
@@ -13,5 +12,5 @@ set(aslnumext_SOURCES
 )
 
 add_library(aslnumext ${aslnumext_SOURCES})
-target_link_libraries(aslnumext PRIVATE ${OpenCL_LIBRARIES} aslacl aslcommon asl)
+target_link_libraries(aslnumext PRIVATE asl aslacl aslcommon ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslnumext aslnumext_PUBLIC_HEADERS)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a1ad2f7..a8b457c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,3 @@
-enable_testing()
-
 add_subdirectory(testABD)
 add_subdirectory(testACL)
 add_subdirectory(testAGL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git



More information about the debian-science-commits mailing list