* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/files/, sci-libs/clfft/
@ 2015-02-08 21:07 Christoph Junghans
0 siblings, 0 replies; 4+ messages in thread
From: Christoph Junghans @ 2015-02-08 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 89e8e9031ccedeef8c39c191c0260825f143b6b2
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Feb 6 09:08:08 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Feb 6 09:08:08 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=89e8e903
New package sci-libs/clfft
---
sci-libs/clfft/ChangeLog | 11 ++++
sci-libs/clfft/clfft-2.2.ebuild | 1 +
sci-libs/clfft/clfft-9999.ebuild | 60 ++++++++++++++++++++++
sci-libs/clfft/files/clfft-client_CMakeLists.patch | 26 ++++++++++
.../files/clfft-scripts_perf_CMakeLists.patch | 13 +++++
sci-libs/clfft/metadata.xml | 17 ++++++
6 files changed, 128 insertions(+)
diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
new file mode 100644
index 0000000..15f7e23
--- /dev/null
+++ b/sci-libs/clfft/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for sci-libs/clfft
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*clfft-2.2 (06 Feb 2015)
+*clfft-9999 (06 Feb 2015)
+
+ 06 Feb 2015; Marius Brehler <marbre@linux.sungazer.de> +clfft-2.2.ebuild,
+ +clfft-9999.ebuild, +files/clfft-client_CMakeLists.patch,
+ +files/clfft-scripts_perf_CMakeLists.patch, +metadata.xml:
+ sci-libs/clfft: Inital commit
diff --git a/sci-libs/clfft/clfft-2.2.ebuild b/sci-libs/clfft/clfft-2.2.ebuild
new file mode 120000
index 0000000..b6c165d
--- /dev/null
+++ b/sci-libs/clfft/clfft-2.2.ebuild
@@ -0,0 +1 @@
+clfft-9999.ebuild
\ No newline at end of file
diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild
new file mode 100644
index 0000000..ffe4f5d
--- /dev/null
+++ b/sci-libs/clfft/clfft-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_PN="clFFT"
+
+DESCRIPTION="A software library containing FFT functions written in OpenCL"
+HOMEPAGE="https://github.com/clMathLibraries/clFFT"
+
+if [ ${PV} == "9999" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
+ S="${WORKDIR}/${P}/src"
+else
+ SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/${MY_PN}-${PV}/src"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ >=sys-devel/gcc-4.6
+ virtual/opencl
+ dev-libs/boost"
+ #test? (
+ # dev-cpp/gtest
+ # sci-libs/fftw:3.0
+ #)"
+DEPEND="${RDEPEND}"
+
+# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
+# Therefore src_test() won't execute any test.
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/clfft-client_CMakeLists.patch
+ "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
+ die "Compilation with gcc older than 4.6 is not supported."
+ fi
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build test TEST)
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/clfft/files/clfft-client_CMakeLists.patch b/sci-libs/clfft/files/clfft-client_CMakeLists.patch
new file mode 100644
index 0000000..d779b45
--- /dev/null
+++ b/sci-libs/clfft/files/clfft-client_CMakeLists.patch
@@ -0,0 +1,26 @@
+Change the client binary's name to clfft-client.
+
+Patch by Marius Brehler.
+--- client/CMakeLists.txt
++++ client/CMakeLists.txt
+@@ -43,15 +43,15 @@ endif( )
+ # Include standard OpenCL headers
+ include_directories( ${Boost_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ../../../common ${PROJECT_BINARY_DIR}/include ../include )
+
+-add_executable( Client ${Client.Files} )
++add_executable( clfft-client ${Client.Files} )
+
+-target_link_libraries( Client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
++target_link_libraries( clfft-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
+
+-set_target_properties( Client PROPERTIES VERSION ${CLFFT_VERSION} )
+-set_target_properties( Client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
++set_target_properties( clfft-client PROPERTIES VERSION ${CLFFT_VERSION} )
++set_target_properties( clfft-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
+
+ # CPack configuration; include the executable into the package
+-install( TARGETS Client
++install( TARGETS clfft-client
+ RUNTIME DESTINATION bin${SUFFIX_BIN}
+ LIBRARY DESTINATION lib${SUFFIX_LIB}
+ ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
diff --git a/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch b/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
new file mode 100644
index 0000000..2976a5e
--- /dev/null
+++ b/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
@@ -0,0 +1,13 @@
+Install Python scripts to /usr/share/clfft and not to /usr/bin.
+
+Patch by Marius Brehler.
+--- scripts/perf/CMakeLists.txt
++++ scripts/perf/CMakeLists.txt
+@@ -21,4 +21,4 @@ set(GRAPHING_SCRIPTS measurePerformance
+ performanceUtility.py
+ )
+
+-install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
+\ No newline at end of file
++install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clfft/${SUFFIX_BIN} )
+\ No newline at end of file
diff --git a/sci-libs/clfft/metadata.xml b/sci-libs/clfft/metadata.xml
new file mode 100644
index 0000000..14184f9
--- /dev/null
+++ b/sci-libs/clfft/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <maintainer>
+ <email>marbre@linux.sungazer.de</email>
+ <name>Marius Brehler</name>
+ </maintainer>
+ <longdescription>
+ clFFT is a software library containing FFT functions written in
+ OpenCL. In addition to GPU devices, the libraries also support
+ running on CPU devices to facilitate debugging and multicore
+ programming.
+ clFFT is part of the clMath sofware library, which is the
+ successor of APPML.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/files/, sci-libs/clfft/
@ 2015-04-07 8:56 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-04-07 8:56 UTC (permalink / raw
To: gentoo-commits
commit: bb7405e79da76e86057725f5520201b46519e506
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Apr 4 09:45:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Apr 4 09:45:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bb7405e7
sci-libs/clfft: Replace patches by upstream patches
Package-Manager: portage-2.2.14
sci-libs/clfft/ChangeLog | 5 ++++
sci-libs/clfft/files/clfft-client_CMakeLists.patch | 33 +++++++++++++++------
.../files/clfft-scripts_perf_CMakeLists.patch | 34 +++++++++++++++++-----
3 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index 04a975b..e97dacd 100644
--- a/sci-libs/clfft/ChangeLog
+++ b/sci-libs/clfft/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>
+ files/clfft-client_CMakeLists.patch,
+ files/clfft-scripts_perf_CMakeLists.patch:
+ Replace patches by upstream patches
+
19 Feb 2015; Marius Brehler <marbre@linux.sungazer.de> clfft-9999.ebuild:
Fix SLOT operators
diff --git a/sci-libs/clfft/files/clfft-client_CMakeLists.patch b/sci-libs/clfft/files/clfft-client_CMakeLists.patch
index d779b45..b6cc530 100644
--- a/sci-libs/clfft/files/clfft-client_CMakeLists.patch
+++ b/sci-libs/clfft/files/clfft-client_CMakeLists.patch
@@ -1,26 +1,41 @@
-Change the client binary's name to clfft-client.
+Upstream patch to change the client binary's name to clFFT-client.
+Remove for clfft-9999 as soon as develop branch is merged into master.
-Patch by Marius Brehler.
---- client/CMakeLists.txt
-+++ client/CMakeLists.txt
+
+From f3cbd72953094217dfeb41c4e2a328d4b4a494e0 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Wed, 18 Feb 2015 09:15:13 +0100
+Subject: [PATCH] Rename Client to clFFT-client
+
+---
+ src/client/CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
+index fdf209f..3b38b95 100644
+--- a/src/client/CMakeLists.txt
++++ b/src/client/CMakeLists.txt
@@ -43,15 +43,15 @@ endif( )
# Include standard OpenCL headers
include_directories( ${Boost_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ../../../common ${PROJECT_BINARY_DIR}/include ../include )
-add_executable( Client ${Client.Files} )
-+add_executable( clfft-client ${Client.Files} )
++add_executable( clFFT-client ${Client.Files} )
-target_link_libraries( Client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
-+target_link_libraries( clfft-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
++target_link_libraries( clFFT-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
-set_target_properties( Client PROPERTIES VERSION ${CLFFT_VERSION} )
-set_target_properties( Client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-+set_target_properties( clfft-client PROPERTIES VERSION ${CLFFT_VERSION} )
-+set_target_properties( clfft-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
++set_target_properties( clFFT-client PROPERTIES VERSION ${CLFFT_VERSION} )
++set_target_properties( clFFT-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
# CPack configuration; include the executable into the package
-install( TARGETS Client
-+install( TARGETS clfft-client
++install( TARGETS clFFT-client
RUNTIME DESTINATION bin${SUFFIX_BIN}
LIBRARY DESTINATION lib${SUFFIX_LIB}
ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+--
+2.0.4
+
diff --git a/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch b/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
index 2976a5e..eec9169 100644
--- a/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
+++ b/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
@@ -1,13 +1,33 @@
-Install Python scripts to /usr/share/clfft and not to /usr/bin.
+Upstream patch to install Python scripts to /usr/share/clfft and not to /usr/bin.
+Remove for clfft-9999 as soon as develop branch is merged into master.
-Patch by Marius Brehler.
---- scripts/perf/CMakeLists.txt
-+++ scripts/perf/CMakeLists.txt
-@@ -21,4 +21,4 @@ set(GRAPHING_SCRIPTS measurePerformance
+From 37b1f443e516f0a87c4a728cac8291148bb31b72 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Wed, 18 Feb 2015 08:59:06 +0100
+Subject: [PATCH] Install scripts/perf to share/clFFT on non WIN32
+ systems
+
+---
+ src/scripts/perf/CMakeLists.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripts/perf/CMakeLists.txt b/src/scripts/perf/CMakeLists.txt
+index 3733789..ca45b92 100644
+--- a/src/scripts/perf/CMakeLists.txt
++++ b/src/scripts/perf/CMakeLists.txt
+@@ -20,5 +20,8 @@ set(GRAPHING_SCRIPTS measurePerformance.py
+ errorHandler.py
performanceUtility.py
)
-
+-
-install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
\ No newline at end of file
-+install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clfft/${SUFFIX_BIN} )
++if( WIN32 )
++ install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
++else ( )
++ install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clFFT )
++endif( )
\ No newline at end of file
+--
+2.0.4
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/files/, sci-libs/clfft/
@ 2015-09-13 18:34 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-09-13 18:34 UTC (permalink / raw
To: gentoo-commits
commit: adb78a0f2f4e1fe4316fa9158e0000c76d5dd36f
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Sep 12 07:27:43 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 07:27:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=adb78a0f
sci-libs/clfft: Patch merged upstream
Package-Manager: portage-2.2.20.1
sci-libs/clfft/ChangeLog | 5 ++++
sci-libs/clfft/clfft-9999.ebuild | 4 ---
...-Install-examples-to-share-clFFT-examples.patch | 29 ----------------------
3 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index 5ccf93b..7156dc3 100644
--- a/sci-libs/clfft/ChangeLog
+++ b/sci-libs/clfft/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 12 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+ -files/clfft-9999-Install-examples-to-share-clFFT-examples.patch,
+ clfft-9999.ebuild:
+ sci-libs/clfft: Patch merged upstream
+
*clfft-2.6.1 (06 Sep 2015)
06 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> +clfft-2.6.1.ebuild,
diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild
index 73577c7..da8499e 100644
--- a/sci-libs/clfft/clfft-9999.ebuild
+++ b/sci-libs/clfft/clfft-9999.ebuild
@@ -32,10 +32,6 @@ DEPEND="${RDEPEND}"
# Therefore src_test() won't execute any test.
RESTRICT="test"
-PATCHES=(
- "${FILESDIR}/${P}"-Install-examples-to-share-clFFT-examples.patch
-)
-
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
diff --git a/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch b/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch
deleted file mode 100644
index 01965d9..0000000
--- a/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch to fix location of examples:
-https://github.com/clMathLibraries/clFFT/pull/108
-
-From 8e34e31465231460d1bda73e34584bc7d4862be1 Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marbre@linux.sungazer.de>
-Date: Sun, 6 Sep 2015 12:01:55 +0200
-Subject: [PATCH] Install examples to share/clFFT/examples
-
----
- src/examples/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
-index f93f0fb..0073a34 100644
---- a/src/examples/CMakeLists.txt
-+++ b/src/examples/CMakeLists.txt
-@@ -47,7 +47,7 @@ FOREACH(FILE ${FILES})
- OUTPUT_NAME ${EXAMPLE}
- RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
-
-- INSTALL(FILES ${FILE} DESTINATION "share/clFFT")
-+ INSTALL(FILES ${FILE} DESTINATION "share/clFFT/examples")
- INSTALL(TARGETS ${EXAMPLE_NAME}
-- RUNTIME DESTINATION "bin${SUFFIX_BIN}/examples")
-+ RUNTIME DESTINATION "share/clFFT/examples")
- ENDFOREACH()
---
-2.4.6
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/files/, sci-libs/clfft/
@ 2015-11-06 10:19 Marius Brehler
0 siblings, 0 replies; 4+ messages in thread
From: Marius Brehler @ 2015-11-06 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 4e138bcca1e8cd3028432c630e9774e0230261dd
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Nov 6 10:04:07 2015 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Fri Nov 6 10:04:07 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4e138bcc
sci-libs/clfft: Clean patches
Package-Manager: portage-2.2.20.1
sci-libs/clfft/ChangeLog | 6 +
.../clfft/files/clfft-2.4-client_CMakeLists.patch | 41 -------
.../files/clfft-2.4-fix-cmake-config-install.patch | 128 ---------------------
.../files/clfft-2.4-scripts_perf_CMakeLists.patch | 33 ------
4 files changed, 6 insertions(+), 202 deletions(-)
diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index 56c9df8..22dbc1f 100644
--- a/sci-libs/clfft/ChangeLog
+++ b/sci-libs/clfft/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 06 Nov 2015; Marius Brehler <marbre@linux.sungazer.de>
+ -files/clfft-2.4-client_CMakeLists.patch,
+ -files/clfft-2.4-fix-cmake-config-install.patch,
+ -files/clfft-2.4-scripts_perf_CMakeLists.patch:
+ sci-libs/clfft: Clean patches
+
12 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> clfft-2.6.1.ebuild,
clfft-9999.ebuild, metadata.xml:
sci-libs/clfft: Add client and examples use flag
diff --git a/sci-libs/clfft/files/clfft-2.4-client_CMakeLists.patch b/sci-libs/clfft/files/clfft-2.4-client_CMakeLists.patch
deleted file mode 100644
index b6cc530..0000000
--- a/sci-libs/clfft/files/clfft-2.4-client_CMakeLists.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream patch to change the client binary's name to clFFT-client.
-Remove for clfft-9999 as soon as develop branch is merged into master.
-
-
-From f3cbd72953094217dfeb41c4e2a328d4b4a494e0 Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marius.brehler@tu-dortmund.de>
-Date: Wed, 18 Feb 2015 09:15:13 +0100
-Subject: [PATCH] Rename Client to clFFT-client
-
----
- src/client/CMakeLists.txt | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
-index fdf209f..3b38b95 100644
---- a/src/client/CMakeLists.txt
-+++ b/src/client/CMakeLists.txt
-@@ -43,15 +43,15 @@ endif( )
- # Include standard OpenCL headers
- include_directories( ${Boost_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ../../../common ${PROJECT_BINARY_DIR}/include ../include )
-
--add_executable( Client ${Client.Files} )
-+add_executable( clFFT-client ${Client.Files} )
-
--target_link_libraries( Client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
-+target_link_libraries( clFFT-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
-
--set_target_properties( Client PROPERTIES VERSION ${CLFFT_VERSION} )
--set_target_properties( Client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-+set_target_properties( clFFT-client PROPERTIES VERSION ${CLFFT_VERSION} )
-+set_target_properties( clFFT-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-
- # CPack configuration; include the executable into the package
--install( TARGETS Client
-+install( TARGETS clFFT-client
- RUNTIME DESTINATION bin${SUFFIX_BIN}
- LIBRARY DESTINATION lib${SUFFIX_LIB}
- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
---
-2.0.4
-
diff --git a/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch b/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch
deleted file mode 100644
index 6dd1e15..0000000
--- a/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Upstream patch, with modified destdir
-https://github.com/clMathLibraries/clFFT/pull/88
-
-
-Description: install missing cmake config module
-Author: <kent.knox@amd>
-Origin: upstream
-Forwarded: not-needed
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -283,6 +283,29 @@ else( )
- message( "GoogleTest unit tests will NOT be built" )
- endif( )
-
-+if( BUILD_EXAMPLES )
-+ add_subdirectory( examples )
-+endif()
-+
-+if(WIN32)
-+ set(destdir CMake)
-+else()
-+ set(destdir lib${SUFFIX_LIB}/cmake/clFFT)
-+endif()
-+string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
-+configure_file(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfigVersion.cmake.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
-+ @ONLY)
-+configure_file(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfig.cmake.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
-+ @ONLY)
-+install(EXPORT Library DESTINATION ${destdir} FILE clFFTTargets.cmake)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
-+ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
-+ DESTINATION ${destdir})
-+
- # The following code is setting variables to control the behavior of CPack to generate our
- if( WIN32 )
- set( CPACK_SOURCE_GENERATOR "ZIP" )
-diff --git a/src/clFFTConfig.cmake.in b/src/clFFTConfig.cmake.in
-new file mode 100644
-index 0000000..5b58c35
---- /dev/null
-+++ b/src/clFFTConfig.cmake.in
-@@ -0,0 +1,3 @@
-+include(${CMAKE_CURRENT_LIST_DIR}/clFFTTargets.cmake)
-+get_filename_component(CLFFT_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/include ABSOLUTE)
-+set(CLFFT_LIBRARIES clFFT)
-diff --git a/src/clFFTConfigVersion.cmake.in b/src/clFFTConfigVersion.cmake.in
-new file mode 100644
-index 0000000..e358473
---- /dev/null
-+++ b/src/clFFTConfigVersion.cmake.in
-@@ -0,0 +1,46 @@
-+# This is a basic version file for the Config-mode of find_package().
-+# It is used by write_basic_package_version_file() as input file for configure_file()
-+# to create a version-file which can be installed along a config.cmake file.
-+#
-+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-+# the requested version string are exactly the same and it sets
-+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
-+# but only if the requested major version is the same as the current one.
-+# The variable CLFFT_VERSION must be set before calling configure_file().
-+
-+
-+set(PACKAGE_VERSION "@CLFFT_VERSION@")
-+
-+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
-+else()
-+
-+ if("@CLFFT_VERSION@" MATCHES "^([0-9]+)\\.")
-+ set(CLFFT_VERSION_MAJOR "${CMAKE_MATCH_1}")
-+ else()
-+ set(CLFFT_VERSION_MAJOR "@CLFFT_VERSION@")
-+ endif()
-+
-+ if("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "${CLFFT_VERSION_MAJOR}")
-+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
-+ else()
-+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
-+ endif()
-+
-+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-+ set(PACKAGE_VERSION_EXACT TRUE)
-+ endif()
-+endif()
-+
-+
-+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
-+ return()
-+endif()
-+
-+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-+if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
-+ math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
-+ set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-+ set(PACKAGE_VERSION_UNSUITABLE TRUE)
-+endif()
-diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
-index 63ac0f9..0d400d8 100644
---- a/src/library/CMakeLists.txt
-+++ b/src/library/CMakeLists.txt
-@@ -95,6 +95,7 @@ endif( )
-
- # CPack configuration; include the executable into the package
- install( TARGETS clFFT
-+ EXPORT Library
- RUNTIME DESTINATION bin${SUFFIX_BIN}
- LIBRARY DESTINATION lib${SUFFIX_LIB}
- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
-diff --git a/src/statTimer/CMakeLists.txt b/src/statTimer/CMakeLists.txt
-index a635bf1..3dc026f 100644
---- a/src/statTimer/CMakeLists.txt
-+++ b/src/statTimer/CMakeLists.txt
-@@ -80,6 +80,7 @@ endif( )
-
- # CPack configuration; include the executable into the package
- install( TARGETS StatTimer
-+ EXPORT Library
- RUNTIME DESTINATION bin${SUFFIX_BIN}
- LIBRARY DESTINATION lib${SUFFIX_LIB}
- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
---
-2.1.4
-
diff --git a/sci-libs/clfft/files/clfft-2.4-scripts_perf_CMakeLists.patch b/sci-libs/clfft/files/clfft-2.4-scripts_perf_CMakeLists.patch
deleted file mode 100644
index eec9169..0000000
--- a/sci-libs/clfft/files/clfft-2.4-scripts_perf_CMakeLists.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream patch to install Python scripts to /usr/share/clfft and not to /usr/bin.
-Remove for clfft-9999 as soon as develop branch is merged into master.
-
-From 37b1f443e516f0a87c4a728cac8291148bb31b72 Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marius.brehler@tu-dortmund.de>
-Date: Wed, 18 Feb 2015 08:59:06 +0100
-Subject: [PATCH] Install scripts/perf to share/clFFT on non WIN32
- systems
-
----
- src/scripts/perf/CMakeLists.txt | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/scripts/perf/CMakeLists.txt b/src/scripts/perf/CMakeLists.txt
-index 3733789..ca45b92 100644
---- a/src/scripts/perf/CMakeLists.txt
-+++ b/src/scripts/perf/CMakeLists.txt
-@@ -20,5 +20,8 @@ set(GRAPHING_SCRIPTS measurePerformance.py
- errorHandler.py
- performanceUtility.py
- )
--
--install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
-\ No newline at end of file
-+if( WIN32 )
-+ install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
-+else ( )
-+ install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clFFT )
-+endif( )
-\ No newline at end of file
---
-2.0.4
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-06 10:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-08 21:07 [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/files/, sci-libs/clfft/ Christoph Junghans
-- strict thread matches above, loose matches on Subject: below --
2015-04-07 8:56 Justin Lecher
2015-09-13 18:34 Justin Lecher
2015-11-06 10:19 Marius Brehler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox