songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert that commit, which was wrong (see below): 

| ------------------------------------------------------------------------
  | r65557 | lrineau | 2011-09-26 16:49:02 +0200 (Mon, 26 Sep 2011) | 9 lines
  | Changed paths:
  |    M /branches/next/Installation/cmake/modules/CGAL_UseBLAS.cmake
  |    M /branches/next/Installation/cmake/modules/CGAL_UseLAPACK.cmake
  |    M /branches/next/Installation/cmake/modules/FindBLAS.cmake
  |    M /branches/next/Installation/cmake/modules/FindLAPACK.cmake
  |    M /branches/next/Installation/doc_tex/Installation/installation.tex
  | 
  | BLAS and LAPACK do not have header files.
  | 
  | One implementation of BLAS or LAPACK can have a header file, but that is
  | not mandatory for an implementation, and (hopefully) nothing in CGAL tries
  | to include a blas.h or a lapack.h.
  | 
  | The current revision removes mentions of BLAS_INCLUDE_DIR and
  | LAPACK_INCLUDE_DIR in CGAL cmake scripts about BLAS and LAPACK.
  | 
  |
  ------------------------------------------------------------------------

Reason:

  For the implementation cblas/clapack, our use of that implementation does
  need a header <blaswrap.h> to work.
This commit is contained in:
Laurent Rineau 2011-10-13 10:17:16 +00:00
parent 4fff839d84
commit c1fff72997
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Installation/cmake/modules/CGAL_UseBLAS.cmake
View File

@ -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.*" )

3
Installation/cmake/modules/CGAL_UseLAPACK.cmake
View File

@ -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.*" )

10
Installation/cmake/modules/FindBLAS.cmake
View File

@ -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}")

10
Installation/cmake/modules/FindLAPACK.cmake
View File

@ -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}")

2
Installation/doc_tex/Installation/installation.tex
View File

@ -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