[clfft] 05/06: d/p/series: re-order patch series
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jun 4 14:18:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.
commit f55c68b821d47aac61ea5d5c7409a08f7fdfa746
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu Jun 4 14:08:36 2015 +0100
d/p/series: re-order patch series
---
debian/patches/0001-fix-cmake-config-install.patch | 116 ++++++++++++++++++---
...tch => 0001-fix-cmake-config-install.patch.old} | 0
debian/patches/debian-enable-multiarch.patch | 8 +-
debian/patches/series | 3 +-
4 files changed, 110 insertions(+), 17 deletions(-)
diff --git a/debian/patches/0001-fix-cmake-config-install.patch b/debian/patches/0001-fix-cmake-config-install.patch
index 5c3683c..aff8290 100644
--- a/debian/patches/0001-fix-cmake-config-install.patch
+++ b/debian/patches/0001-fix-cmake-config-install.patch
@@ -1,34 +1,126 @@
Description: install missing cmake config module
-Author: Kent Knox
+Author: <kent.knox at amd>
Origin: upstream
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -283,6 +283,25 @@
+@@ -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)
++ set(destdir CMake)
+else()
-+ set(destdir share/clFFT)
++ set(destdir share/clFFT)
+endif()
+string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
+configure_file(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfigVersion.cmake.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
-+ @ONLY)
++ ${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)
++ ${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})
++ ${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/debian/patches/0001-fix-cmake-config-install.patch b/debian/patches/0001-fix-cmake-config-install.patch.old
similarity index 100%
copy from debian/patches/0001-fix-cmake-config-install.patch
copy to debian/patches/0001-fix-cmake-config-install.patch.old
diff --git a/debian/patches/debian-enable-multiarch.patch b/debian/patches/debian-enable-multiarch.patch
index ba46694..344a5eb 100644
--- a/debian/patches/debian-enable-multiarch.patch
+++ b/debian/patches/debian-enable-multiarch.patch
@@ -14,12 +14,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
# Useful variables to configure FindBoost.cake
-@@ -286,7 +286,7 @@
+@@ -290,7 +290,7 @@
if(WIN32)
- set(destdir CMake)
+ set(destdir CMake)
else()
-- set(destdir share/clFFT)
-+ set(destdir "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/clFFT")
+- set(destdir share/clFFT)
++ set(destdir lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/clFFT)
endif()
string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
configure_file(
diff --git a/debian/patches/series b/debian/patches/series
index f01d70e..59a32f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-0001-enable-multiarch.patch
+0001-fix-cmake-config-install.patch
0002-fix-doxygen-settings.patch
0003-fix-client-name.patch
+debian-enable-multiarch.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git
More information about the debian-science-commits
mailing list