[clfft] 34/107: Manual merge of cmake-config branch

[Ghislain Vaillant]

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

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

commit 69a65382a7a9bcec4423c9128aa4913adaf3401d
Merge: e10f0c2 c7bac74
Author: Kent Knox <kent.knox at amd>
Date:   Thu Mar 12 11:15:54 2015 -0500

    Manual merge of cmake-config branch

 src/CMakeLists.txt              | 19 +++++++++++++++++
 src/clFFTConfig.cmake.in        |  3 +++
 src/clFFTConfigVersion.cmake.in | 46 +++++++++++++++++++++++++++++++++++++++++
 src/library/CMakeLists.txt      |  1 +
 src/statTimer/CMakeLists.txt    |  1 +
 5 files changed, 70 insertions(+)

diff --cc src/CMakeLists.txt
index b56d266,0b0a3d5..93e8220
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -280,10 -279,25 +280,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 share/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" )

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