diff --git a/Installation/cmake/modules/CGAL_UseBLAS.cmake b/Installation/cmake/modules/CGAL_UseBLAS.cmake index 161d2f39d95..9e3bd72a4c6 100644 --- a/Installation/cmake/modules/CGAL_UseBLAS.cmake +++ b/Installation/cmake/modules/CGAL_UseBLAS.cmake @@ -3,6 +3,9 @@ if ( BLAS_FOUND AND NOT CGAL_BLAS_SETUP ) + message( STATUS "BLAS include: ${BLAS_INCLUDE_DIR}" ) + include_directories ( ${BLAS_INCLUDE_DIR} ) + message( STATUS "BLAS definitions: ${BLAS_DEFINITIONS}" ) add_definitions( ${BLAS_DEFINITIONS} ) if ( "${BLAS_DEFINITIONS}" MATCHES ".*BLAS_USE_F2C.*" ) diff --git a/Installation/cmake/modules/CGAL_UseLAPACK.cmake b/Installation/cmake/modules/CGAL_UseLAPACK.cmake index 9ccde556508..51c8bca807f 100644 --- a/Installation/cmake/modules/CGAL_UseLAPACK.cmake +++ b/Installation/cmake/modules/CGAL_UseLAPACK.cmake @@ -3,6 +3,9 @@ if ( LAPACK_FOUND AND NOT CGAL_LAPACK_SETUP ) + message( STATUS "LAPACK include: ${LAPACK_INCLUDE_DIR}" ) + include_directories ( ${LAPACK_INCLUDE_DIR} ) + message( STATUS "LAPACK definitions: ${LAPACK_DEFINITIONS}" ) add_definitions( ${LAPACK_DEFINITIONS} ) if ( "${LAPACK_DEFINITIONS}" MATCHES ".*LAPACK_USE_F2C.*" ) diff --git a/Installation/cmake/modules/FindBLAS.cmake b/Installation/cmake/modules/FindBLAS.cmake index 3d1192d105a..f00a896d66f 100644 --- a/Installation/cmake/modules/FindBLAS.cmake +++ b/Installation/cmake/modules/FindBLAS.cmake @@ -9,6 +9,7 @@ # This module sets the following variables: # BLAS_FOUND - set to true if a library implementing the BLAS interface # is found +# BLAS_INCLUDE_DIR - Directories containing the BLAS header files # BLAS_DEFINITIONS - Compilation options to use BLAS # BLAS_LINKER_FLAGS - Linker flags to use BLAS (excluding -l # and -L). @@ -22,7 +23,7 @@ # This module was modified by CGAL team: # - find BLAS library shipped with TAUCS # - find libraries for a C++ compiler, instead of Fortran -# - added BLAS_DEFINITIONS and BLAS_LIBRARIES_DIR +# - added BLAS_INCLUDE_DIR, BLAS_DEFINITIONS and BLAS_LIBRARIES_DIR # - removed BLAS95_LIBRARIES # # TODO (CGAL): @@ -152,19 +153,21 @@ if (BLAS_LIBRARIES_DIR OR BLAS_LIBRARIES) else() # reset variables + set( BLAS_INCLUDE_DIR "" ) set( BLAS_DEFINITIONS "" ) set( BLAS_LINKER_FLAGS "" ) set( BLAS_LIBRARIES "" ) set( BLAS_LIBRARIES_DIR "" ) # Look first for the TAUCS library distributed with CGAL in auxiliary/taucs. - # Set CGAL_TAUCS_FOUND, and CGAL_TAUCS_LIBRARIES_DIR. + # Set CGAL_TAUCS_FOUND, CGAL_TAUCS_INCLUDE_DIR and CGAL_TAUCS_LIBRARIES_DIR. include(CGAL_Locate_CGAL_TAUCS) # Search for BLAS in CGAL_TAUCS_INCLUDE_DIR/CGAL_TAUCS_LIBRARIES_DIR (TAUCS shipped with CGAL)... if(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED) # if VC++: done + set( BLAS_INCLUDE_DIR "${CGAL_TAUCS_INCLUDE_DIR}" ) set( BLAS_LIBRARIES_DIR "${CGAL_TAUCS_LIBRARIES_DIR}" ) # ...else search for BLAS in $BLAS_LIB_DIR environment variable @@ -470,6 +473,8 @@ else() endif(NOT BLAS_FIND_QUIETLY) # Add variables to cache + set( BLAS_INCLUDE_DIR "${BLAS_INCLUDE_DIR}" + CACHE PATH "Directories containing the BLAS header files" FORCE ) set( BLAS_DEFINITIONS "${BLAS_DEFINITIONS}" CACHE STRING "Compilation options to use BLAS" FORCE ) set( BLAS_LINKER_FLAGS "${BLAS_LINKER_FLAGS}" @@ -479,6 +484,7 @@ else() set( BLAS_LIBRARIES_DIR "${BLAS_LIBRARIES_DIR}" CACHE PATH "Directories containing the BLAS libraries" FORCE ) + #message("DEBUG: BLAS_INCLUDE_DIR = ${BLAS_INCLUDE_DIR}") #message("DEBUG: BLAS_DEFINITIONS = ${BLAS_DEFINITIONS}") #message("DEBUG: BLAS_LINKER_FLAGS = ${BLAS_LINKER_FLAGS}") #message("DEBUG: BLAS_LIBRARIES = ${BLAS_LIBRARIES}") diff --git a/Installation/cmake/modules/FindLAPACK.cmake b/Installation/cmake/modules/FindLAPACK.cmake index cbcadd4c18c..660429c0756 100644 --- a/Installation/cmake/modules/FindLAPACK.cmake +++ b/Installation/cmake/modules/FindLAPACK.cmake @@ -8,6 +8,7 @@ # This module sets the following variables: # LAPACK_FOUND - set to true if a library implementing the LAPACK interface # is found +# LAPACK_INCLUDE_DIR - Directories containing the LAPACK header files # LAPACK_DEFINITIONS - Compilation options to use LAPACK # LAPACK_LINKER_FLAGS - Linker flags to use LAPACK (excluding -l # and -L). @@ -21,7 +22,7 @@ # This module was modified by CGAL team: # - find LAPACK library shipped with TAUCS # - find libraries for a C++ compiler, instead of Fortran -# - added LAPACK_DEFINITIONS and LAPACK_LIBRARIES_DIR +# - added LAPACK_INCLUDE_DIR, LAPACK_DEFINITIONS and LAPACK_LIBRARIES_DIR # - removed LAPACK95_LIBRARIES # # TODO (CGAL): @@ -163,19 +164,21 @@ elseif (LAPACK_LIBRARIES_DIR OR LAPACK_LIBRARIES) else() # reset variables + set( LAPACK_INCLUDE_DIR "" ) set( LAPACK_DEFINITIONS "" ) set( LAPACK_LINKER_FLAGS "" ) # unused (yet) set( LAPACK_LIBRARIES "" ) set( LAPACK_LIBRARIES_DIR "" ) # Look first for the TAUCS library distributed with CGAL in auxiliary/taucs. - # Set CGAL_TAUCS_FOUND, and CGAL_TAUCS_LIBRARIES_DIR. + # Set CGAL_TAUCS_FOUND, CGAL_TAUCS_INCLUDE_DIR and CGAL_TAUCS_LIBRARIES_DIR. include(CGAL_Locate_CGAL_TAUCS) # Search for LAPACK in CGAL_TAUCS_INCLUDE_DIR/CGAL_TAUCS_LIBRARIES_DIR (TAUCS shipped with CGAL)... if(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED) # if VC++: done + set( LAPACK_INCLUDE_DIR "${CGAL_TAUCS_INCLUDE_DIR}" ) set( LAPACK_LIBRARIES_DIR "${CGAL_TAUCS_LIBRARIES_DIR}" ) # ...else in $LAPACK_LIB_DIR environment variable @@ -296,6 +299,8 @@ else() endif(NOT LAPACK_FIND_QUIETLY) # Add variables to cache + set( LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" + CACHE PATH "Directories containing the LAPACK header files" FORCE ) set( LAPACK_DEFINITIONS "${LAPACK_DEFINITIONS}" CACHE STRING "Compilation options to use LAPACK" FORCE ) set( LAPACK_LINKER_FLAGS "${LAPACK_LINKER_FLAGS}" @@ -305,6 +310,7 @@ else() set( LAPACK_LIBRARIES_DIR "${LAPACK_LIBRARIES_DIR}" CACHE PATH "Directories containing the LAPACK libraries" FORCE ) + #message("DEBUG: LAPACK_INCLUDE_DIR = ${LAPACK_INCLUDE_DIR}") #message("DEBUG: LAPACK_DEFINITIONS = ${LAPACK_DEFINITIONS}") #message("DEBUG: LAPACK_LINKER_FLAGS = ${LAPACK_LINKER_FLAGS}") #message("DEBUG: LAPACK_LIBRARIES = ${LAPACK_LIBRARIES}") diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 12e4467f145..a6c03aa153a 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -1152,11 +1152,13 @@ variable. You do not need to provide this, if the BLAS|LAPACK libraries do not n \gdef\lcTabularBorder{2} \begin{tabular}{|l|l|l|} \hline \textbf{Variable} & \textbf{Description} & \textbf{Type}\\\hline\hline + \texttt{BLAS\_INCLUDE\_DIR} & Directory containing blas header files & CMake\\\hline \texttt{BLAS\_LIBRARIES\_DIR} & Directory containing the compiled libraries implementing BLAS & Environment\\\hline \texttt{BLAS\_LIB\_DIR} & Idem & Environment\\\hline \texttt{BLAS\_LIBRARIES} & Semi-colon separated list of library pathnames implementing the BLAS functions & CMake\\\hline \texttt{BLAS\_LINKER\_FLAGS} & Linker flags & CMake\\\hline \texttt{BLAS\_DEFINITIONS} & Preprocessor definitions & CMake\\\hline + \texttt{LAPACK\_INCLUDE\_DIR} & Directory containing blas header files & CMake\\\hline \texttt{LAPACK\_LIBRARIES\_DIR} & Directory containing the compiled libraries implementing LAPACK & Environment\\\hline \texttt{LAPACK\_LIB\_DIR} & Idem & Environment\\\hline \texttt{LAPACK\_LIBRARIES} & Semi-colon separated list of library pathnames implementing the LAPACK functions & CMake\\\hline