[SCM] ViennaCL packaging branch, master, updated. debian/1.1.1-1-18-g43cf8e4
Michael Wild
themiwi at users.sourceforge.net
Tue Jul 12 17:49:50 UTC 2011
The following commit has been merged in the master branch:
commit 1ec6901b11617a3a24adab3fe2013c8159b1b6d3
Author: Michael Wild <themiwi at users.sourceforge.net>
Date: Tue Jul 5 17:26:07 2011 +0200
Add patch to properly link against libOpenCL
Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
diff --git a/debian/patches/0001-Properly-link-tests-against-libOpenCL.patch b/debian/patches/0001-Properly-link-tests-against-libOpenCL.patch
new file mode 100644
index 0000000..aa5706b
--- /dev/null
+++ b/debian/patches/0001-Properly-link-tests-against-libOpenCL.patch
@@ -0,0 +1,33 @@
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Tue, 5 Jul 2011 17:24:52 +0200
+Subject: Properly link tests against libOpenCL
+
+Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
+---
+ tests/CMakeLists.txt | 14 +-------------
+ 1 files changed, 1 insertions(+), 13 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index d5cf057..8400799 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -90,17 +90,5 @@ ENDFOREACH(PROG)
+
+ ADD_EXECUTABLE(external_linkage ../src/external_1.cpp
+ ../src/external_2.cpp)
+-
+-#-----------------------------------------------------------------------------
+-
+-#-----------------------------------------------------------------------------
+-# Mac OS X specific linker part
+-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+- set(CMAKE_EXE_LINKER_FLAGS "-framework OpenCL")
+-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-
+-# Linux specific linker part
+-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+- set(CMAKE_EXE_LINKER_FLAGS "-lOpenCL")
+-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++TARGET_LINK_LIBRARIES(external_linkage OpenCL)
+ #-----------------------------------------------------------------------------
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..27976db
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Properly-link-tests-against-libOpenCL.patch
--
ViennaCL packaging
More information about the debian-science-commits
mailing list