[clblas] 121/125: refactored CMakeLists.txt in BUILD_TEST block, added test for OSX detection to turn off CORR_TEST_WITH_ACML

[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 dc304d80ce3d2298000ace4e2cb1d0643426faa7
Author: Lee Zamparo <zamparo at gmail.com>
Date:   Wed May 13 15:14:54 2015 -0400

    refactored CMakeLists.txt in BUILD_TEST block, added test for OSX detection to turn off CORR_TEST_WITH_ACML
---
 src/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 389a9a2..bbb5ade 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,13 @@ option( BUILD_SHARED_LIBS "Build shared libraries" ON )
 
 # By default test-correctness is linked and tested against ACML library.
 # However, test-correctness can instead use NETLIB as a reference library
-set(CORR_TEST_WITH_ACML ON CACHE BOOL "Use ACML library in correctness tests")
+# On Mac OSX systems, this must be set to OFF for the build to succeed (due to nesting of FindBLAS code)
+if ( APPLE )
+	set(CORR_TEST_WITH_ACML OFF CACHE BOOL "Use ACML library in correctness tests")
+else ( )
+	message(STATUS "CORR_TEST_WITH_ACML set to ON")
+	set(CORR_TEST_WITH_ACML ON CACHE BOOL "Use ACML library in correctness tests")
+endif( )
 
 if( CMAKE_GENERATOR MATCHES "NMake" )
   option( NMAKE_COMPILE_VERBOSE "Print compile and link strings to the console" OFF )

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