Changeset a965ab8 in tol

Timestamp:

Dec 11, 2015, 9:47:26 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

4ff8483

Parents:

3ea8b10

Message:

Correcciones relacionadas con la situación en la cual están instaladas dos versiones de lapack (la estandar y ATLAS). A veces hay que ayudarle invocando cmake así:

LD_LIBRARY_PATH=/usr/lib64/atlas cmake -DCLAPACK_DIR=/usr/lib64/atlas -DBLA_VENDOR=ATLAS ...

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7101 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/cmake/modules/FindCLAPACK.cmake (modified) (2 diffs)

tol/cmake/modules/FindCLAPACK.cmake

@@ -54 +54 @@
 
 set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
-check_library_exists( "" ${NameFunction} "" FOUND_CLAPACK_DPOTRF )
+list( GET LAPACK_LIBRARIES 0 first_lib )
+check_library_exists( ${first_lib} ${NameFunction} "" FOUND_CLAPACK_DPOTRF )
 if( FOUND_CLAPACK_DPOTRF  )
   message( STATUS "${CLAPACK_NAME} API found in LAPACK" )
   set( CLAPACK_LIBRARIES ${LAPACK_LIBRARIES} )
-  list( GET LAPACK_LIBRARIES 0 first )
-  set( CLAPACK_LIBRARY ${first} CACHE PATH "" FORCE )
+  set( CLAPACK_LIBRARY ${first_lib} CACHE PATH "" FORCE )
   set( CLAPACK_FOUND TRUE )
 else( FOUND_CLAPACK_DPOTRF )
@@ -75 +75 @@
   if ( CLAPACK_FOUND )
     set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
-    check_library_exists( "${CLAPACK_LIBRARY}" ${NameFunction} "" FOUND_CLAPACK_DPOTRF )
-    if( NOT FOUND_CLAPACK_DPOTRF )
-      message( WARNING "Could not find LAPACKE_dpotrf in ${CLAPACK_LIBRARY}, take a look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. You most likely have to set CLAPACK_LIBRARY by hand (i.e. -DLAPACK_LIBRARY='/path/to/libclapack.so') !" )
-    endif( NOT FOUND_CLAPACK_DPOTRF )
+    check_library_exists( "${CLAPACK_LIBRARY}" ${NameFunction} "" FOUND_CLAPACK_DPOTRF_OTHER )
+    if( NOT FOUND_CLAPACK_DPOTRF_OTHER )
+      message( WARNING "Could not find ${NameFunction} in ${CLAPACK_LIBRARY}, take a look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. You most likely have to set CLAPACK_LIBRARY by hand (i.e. -DCLAPACK_LIBRARY='/path/to/libclapack.so') !" )
+    endif( NOT FOUND_CLAPACK_DPOTRF_OTHER )
     set(CMAKE_REQUIRED_LIBRARIES )
   endif( CLAPACK_FOUND )