[Cmake-commits] [cmake-commits] alin.elena committed FindBLAS.cmake 1.4 1.5 FindLAPACK.cmake 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv13562/Modules

Modified Files:
	FindBLAS.cmake FindLAPACK.cmake 
Log Message:

ENH: checks if Fortran is enbaled. If not an error message is produced.


Index: FindBLAS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBLAS.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** FindBLAS.cmake	17 Jun 2008 17:27:19 -0000	1.4
--- FindBLAS.cmake	21 Jul 2008 17:40:31 -0000	1.5
***************
*** 1,3 ****
! # - Find BLAS library
  # This module finds an installed fortran library that implements the BLAS 
  # linear-algebra interface (see http://www.netlib.org/blas/).  
--- 1,4 ----
! # - Find a Fortran BLAS library
! # N.B. Fortran only.  This module cannot be used to find a C BLAS library.
  # This module finds an installed fortran library that implements the BLAS 
  # linear-algebra interface (see http://www.netlib.org/blas/).  
***************
*** 16,19 ****
--- 17,25 ----
  #
  
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+ if(NOT _LANGUAGES_ MATCHES Fortran)
+   message(FATAL_ERROR "FindBLAS is Fortran-only so Fortran must be enabled.")
+ endif(NOT _LANGUAGES_ MATCHES Fortran)
+ 
  include(CheckFortranFunctionExists)
  
***************
*** 66,73 ****
      set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}})
      #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
!     get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
!     if(_LANGUAGES_ MATCHES Fortran)
!       check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
!     endif(_LANGUAGES_ MATCHES Fortran)
      set(CMAKE_REQUIRED_LIBRARIES)
      mark_as_advanced(${_prefix}${_combined_name}_WORKS)
--- 72,76 ----
      set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}})
      #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
!     check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
      set(CMAKE_REQUIRED_LIBRARIES)
      mark_as_advanced(${_prefix}${_combined_name}_WORKS)

Index: FindLAPACK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLAPACK.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** FindLAPACK.cmake	21 Jul 2008 08:56:26 -0000	1.3
--- FindLAPACK.cmake	21 Jul 2008 17:40:31 -0000	1.4
***************
*** 1,3 ****
! # - Find LAPACK library
  # This module finds an installed fortran library that implements the LAPACK
  # linear-algebra interface (see http://www.netlib.org/lapack/).
--- 1,4 ----
! # - Find a Fortran LAPACK library
! # N.B. Fortran only.  This module cannot be used to find a C LAPACK library.
  # This module finds an installed fortran library that implements the LAPACK
  # linear-algebra interface (see http://www.netlib.org/lapack/).
***************
*** 18,21 ****
--- 19,27 ----
  #
   
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+ if(NOT _LANGUAGES_ MATCHES Fortran)
+   message(FATAL_ERROR "FindLAPACK is Fortran-only so Fortran must be enabled.")
+ endif(NOT _LANGUAGES_ MATCHES Fortran)
+ 
  include(CheckFortranFunctionExists)
  set(LAPACK_FOUND FALSE)