[arrayfire] 241/284: Move ArrayFireConfig, CPack (as CPackConfig) into CMakeModules

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Sun Feb 7 18:59:37 UTC 2016


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

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit 043739fd255b8a7a90bd4e7722462888b999a885
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Thu Jan 21 14:38:45 2016 -0500

    Move ArrayFireConfig, CPack (as CPackConfig) into CMakeModules
---
 CMakeLists.txt                                                    | 8 ++++----
 ArrayFireConfig.cmake.in => CMakeModules/ArrayFireConfig.cmake.in | 0
 .../ArrayFireConfigVersion.cmake.in                               | 0
 CPack.cmake => CMakeModules/CPackConfig.cmake                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61a78a6..f54a9be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,7 @@ ENDIF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
 SET(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
 SET(BACKEND_DIR "src/backend/\${lowerbackend}")
 CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/ArrayFireConfig.cmake.in
+    ${CMAKE_MODULE_PATH}/ArrayFireConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ArrayFireConfig.cmake
     @ONLY)
 
@@ -231,11 +231,11 @@ STRING(REGEX REPLACE "[^/]+" ".." reldir "${AF_INSTALL_CMAKE_DIR}")
 SET(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/${reldir}/include")
 set(BACKEND_DIR)
 CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/ArrayFireConfig.cmake.in
+    ${CMAKE_MODULE_PATH}/ArrayFireConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/Install/ArrayFireConfig.cmake
     @ONLY)
 CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/ArrayFireConfigVersion.cmake.in
+    ${CMAKE_MODULE_PATH}/ArrayFireConfigVersion.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ArrayFireConfigVersion.cmake
     @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Install/ArrayFireConfig.cmake
@@ -263,4 +263,4 @@ ENDIF(APPLE)
 ##
 # Packaging
 ##
-include(${CMAKE_CURRENT_SOURCE_DIR}/CPack.cmake)
+include(${CMAKE_MODULE_PATH}/CPackConfig.cmake)
diff --git a/ArrayFireConfig.cmake.in b/CMakeModules/ArrayFireConfig.cmake.in
similarity index 100%
rename from ArrayFireConfig.cmake.in
rename to CMakeModules/ArrayFireConfig.cmake.in
diff --git a/ArrayFireConfigVersion.cmake.in b/CMakeModules/ArrayFireConfigVersion.cmake.in
similarity index 100%
rename from ArrayFireConfigVersion.cmake.in
rename to CMakeModules/ArrayFireConfigVersion.cmake.in
diff --git a/CPack.cmake b/CMakeModules/CPackConfig.cmake
similarity index 98%
rename from CPack.cmake
rename to CMakeModules/CPackConfig.cmake
index 2e7f1d5..de242a9 100644
--- a/CPack.cmake
+++ b/CMakeModules/CPackConfig.cmake
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-include("${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/Version.cmake")
+INCLUDE("${CMAKE_MODULE_PATH}/Version.cmake")
 
 # CPack package generation
 #SET(CPACK_GENERATOR "TGZ;STGZ")

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



More information about the debian-science-commits mailing list