[clblas] 49/125: The ACML_ROOT variable was being clobbered even if the user passed in a valid value for ACML_ROOT through the command line. Removed the overwrite statement and instead added the ACML_ROOT environment variable to the HINTS section of find_library().

[Ghislain Vaillant]

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

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

commit 9f7538a5a771d382142c0e8a103bb0503b08cee6
Author: Kent Knox <kent.knox at amd>
Date:   Tue Jan 7 16:26:19 2014 -0600

    The ACML_ROOT variable was being clobbered even if the user passed
    in a valid value for ACML_ROOT through the command line.  Removed
    the overwrite statement and instead added the ACML_ROOT environment
    variable to the HINTS section of find_library().
    
    Also, added a new location on Linux to find the dependant clBLAS.so
    library, for the packaging step.
---
 src/CMakeLists.txt                      | 14 ++++++++------
 src/tests/copyTestDependencies.cmake.in |  4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 76547fc..44f51af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,8 +71,6 @@ if( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
 	set( CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/package" CACHE PATH "Install path prefix, prepended onto install directories" FORCE )
 endif( )
 
-set( ACML_ROOT $ENV{ACML_ROOT} CACHE PATH "AMD ACML root path")
-
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug CACHE STRING
       "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
@@ -141,9 +139,10 @@ if( BUILD_TEST )
 
 		find_path(ACML_INCLUDE_DIRS acml.h
 			HINTS
-				$ENV{ACML_ROOT}/include
 				${ACML_ROOT}/include
 				${ACML_ROOT}/${ACML_SUBDIR}/include
+				$ENV{ACML_ROOT}/include
+                                $ENV{ACML_ROOT}/${ACML_SUBDIR}/include
 		)
 
 		if( ACML_INCLUDE_DIRS )
@@ -154,15 +153,17 @@ if( BUILD_TEST )
 		if( UNIX )
 			find_library(ACML_LIBRARIES acml acml_mp
 				HINTS
-					$ENV{ACML_ROOT}/lib
 					${ACML_ROOT}/lib
 					${ACML_ROOT}/${ACML_SUBDIR}/lib
+					$ENV{ACML_ROOT}/lib
+                                        $ENV{ACML_ROOT}/${ACML_SUBDIR}/lib
 			)
 			find_library(_acml_mv_library acml_mv
 				HINTS
-					$ENV{ACML_ROOT}/lib
 					${ACML_ROOT}/lib
 					${ACML_ROOT}/${ACML_SUBDIR}/lib
+					$ENV{ACML_ROOT}/lib
+                                        $ENV{ACML_ROOT}/${ACML_SUBDIR}/lib
 			)
 			mark_as_advanced(_acml_mv_library)
 		endif( )
@@ -170,9 +171,10 @@ if( BUILD_TEST )
 		if(WIN32)
 			find_library(ACML_LIBRARIES libacml_dll libacml_mp_dll
 				HINTS
-					$ENV{ACML_ROOT}/lib
 					${ACML_ROOT}/lib
 					${ACML_ROOT}/${ACML_SUBDIR}/lib
+					$ENV{ACML_ROOT}/lib
+                                        $ENV{ACML_ROOT}/${ACML_SUBDIR}/lib
 			)
 		endif( )
 		
diff --git a/src/tests/copyTestDependencies.cmake.in b/src/tests/copyTestDependencies.cmake.in
index 3a5d395..357ac7a 100644
--- a/src/tests/copyTestDependencies.cmake.in
+++ b/src/tests/copyTestDependencies.cmake.in
@@ -43,6 +43,10 @@ endif( )
 
 if( EXISTS "${testDir}" )
     list( APPEND depList "${testDir}" )
+    # On linux, the .so files are not staged with the rest of the executables
+    if( UNIX )
+       list( APPEND depList "${testDir}/../library" )
+    endif( )
 endif( )
 
 # message( STATUS "depList: ${depList}" )

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