Changeset 67d200b in tol

Timestamp:

Jan 14, 2015, 7:49:09 AM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

434fc17

Parents:

c07874d

Message:

incorporamos FindCLAPACK a la compilación basada en cmake, refs #1812, #1818

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

Location:

tol

Files:

• CMakeLists.txt (modified) (3 diffs)
• btol/vmatrix_type/CMakeLists.txt (modified) (1 diff)
• cmake/modules/FindCBLAS.cmake (modified) (2 diffs)
• cmake/modules/FindCLAPACK.cmake (added)

tol/CMakeLists.txt

@@ -91 +91 @@
 endif( )
 
-# GSl configuration
+# GSL configuration
 find_package( GSL REQUIRED )
 
@@ -100 +100 @@
 endif( )
 
+# CBLAS configuration
 find_package( CBLAS )
 if( CBLAS_FOUND )
   set( HAVE_CBLAS_H 1 CACHE INTERNAL "" )
   if( TRACE_COMPONENTS_FOUND )
+    message( "CBLAS_INCLUDE_DIR = ${CBLAS_INCLUDE_DIR}" )
     message( "CBLAS_LIBRARY = ${CBLAS_LIBRARY}" )
-    message( "CBLAS_INCLUDE_DIR = ${CBLAS_INCLUDE_DIR}" )
+    message( "CBLAS_LIBRARIES = ${CBLAS_LIBRARIES}" )
   endif( TRACE_COMPONENTS_FOUND )
 else( CBLAS_FOUND )
   message( STATUS "CBLAS not found, using gslcblas = ${GSLCBLAS_LIBRARY}" )
   set( CBLAS_LIBRARY ${GSL_CBLAS_LIBRARY} )
+  set( CBLAS_LIBRARIES ${GSL_CBLAS_LIBRARIES} )
   set( CBLAS_INCLUDE_DIR ${GSL_INCLUDE_DIRS} )
 endif( CBLAS_FOUND )
+
+# CLAPACK configuration
+find_package( CLAPACK REQUIRED )
+
+if( CLAPACK_FOUND AND TRACE_COMPONENTS_FOUND )
+  message("CLAPACK_INCLUDE_DIR = ${CLAPACK_INCLUDE_DIR}")
+  message("CLAPACK_LIBRARY = ${CLAPACK_LIBRARY}")
+  message("CLAPACK_LIBRARIES = ${CLAPACK_LIBRARIES}")
+endif( )
+
 # BZIP2 configuration
 find_package( BZip2 REQUIRED )
@@ -219 +232 @@
 add_library( tol SHARED ${TOL_SUBLIBRARIES} )
 target_link_libraries( tol 
-  ${GSL_LIBRARY} ${CBLAS_LIBRARY} ${BZIP2_LIBRARIES} ${Boost_LIBRARIES}
+  ${GSL_LIBRARY} ${CBLAS_LIBRARIES} ${CLAPACK_LIBRARIES}
+  ${BZIP2_LIBRARIES} ${Boost_LIBRARIES}
   ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${ZLIB_LIBRARIES}
   ${ZIPARCHIVE_LIBRARY} ${CHOLMOD_LIBRARIES} ${LTDL_LIBRARIES} )

tol/btol/vmatrix_type/CMakeLists.txt

@@ -9 +9 @@
 target_include_directories( vmatrix_type PRIVATE
   "${CHOLMOD_INCLUDE_DIR}"
-  "${PROJECT_SOURCE_DIR}/bmath/gsl_ext" )
+  "${PROJECT_SOURCE_DIR}/bmath/gsl_ext" 
+  "{$CBLAS_INCLUDE_DIR}" )

tol/cmake/modules/FindCBLAS.cmake

@@ -33 +33 @@
 
 include( FindPackageHandleStandardArgs )
-# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE
+# handle the QUIETLY and REQUIRED arguments and set CLAPACK_FOUND to TRUE
 # if all listed variables are TRUE
 
@@ -42 +42 @@
   check_library_exists( "${CBLAS_LIBRARY}" cblas_dtrsm "" FOUND_CBLAS_DTRSM )
   if( NOT FOUND_CBLAS_DTRSM )
-    message( FATAL_ERROR "Could not find cblas_dtrsm in ${CBLAS_LIBRARY}, take a look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set CBLAS_LIBRARY by hand (i.e. -DCBLAS_LIBRARY='/path/to/libcblas.so') !" )
+    message( FATAL_ERROR "Could not find cblas_dtrsm in ${CBLAS_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 will most likely have to set CBLAS_LIBRARY by hand (i.e. -DCBLAS_LIBRARY='/path/to/libcblas.so') !" )
   endif( NOT FOUND_CBLAS_DTRSM )
 endif (CBLAS_FOUND)