[Cmake-commits] CMake branch, next, updated. v2.8.3-1089-g604a960
Alexey Ozeritsky
aozeritsky at gmail.com
Mon Dec 27 03:44:41 EST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 604a960f22c8a81f512353d4fa99afb3256906d3 (commit)
via 51253da8bb193cdac4ac45ac43b250cecc2c0e87 (commit)
via e64b5daeced6ed29cc9fce252a137a097972b9ce (commit)
via 1279bd7bac7c9970ae1ea76744d05299232e4b04 (commit)
from faed4393fb4db017703917521458e34c9f9c9ac6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=604a960f22c8a81f512353d4fa99afb3256906d3
commit 604a960f22c8a81f512353d4fa99afb3256906d3
Merge: faed439 51253da
Author: Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Mon Dec 27 03:44:14 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 27 03:44:14 2010 -0500
Merge topic 'FindBLAS_FindLAPACK' into next
51253da FindLAPACK works with C/C++ only projects (issue 0009976)
e64b5da fix for Fortran-only projects
1279bd7 find ACML fixes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51253da8bb193cdac4ac45ac43b250cecc2c0e87
commit 51253da8bb193cdac4ac45ac43b250cecc2c0e87
Author: Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Mon Dec 27 11:42:41 2010 +0300
Commit: Alexey Ozeritsky <aozeritsky at gmail.com>
CommitDate: Mon Dec 27 11:42:41 2010 +0300
FindLAPACK works with C/C++ only projects (issue 0009976)
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index f7b7ab5..bf45406 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -37,17 +37,12 @@
# License text for the above reference.)
get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
-if(NOT _LANGUAGES_ MATCHES Fortran)
- if(LAPACK_FIND_REQUIRED)
- message(FATAL_ERROR
- "FindLAPACK is Fortran-only so Fortran must be enabled.")
- else(LAPACK_FIND_REQUIRED)
- message(STATUS "Looking for LAPACK... - NOT found (Fortran not enabled)")
- return()
- endif(LAPACK_FIND_REQUIRED)
-endif(NOT _LANGUAGES_ MATCHES Fortran)
-
+if (NOT _LANGUAGES_ MATCHES Fortran)
+include(CheckFunctionExists)
+else (NOT _LANGUAGES_ MATCHES Fortran)
include(CheckFortranFunctionExists)
+endif (NOT _LANGUAGES_ MATCHES Fortran)
+
set(LAPACK_FOUND FALSE)
set(LAPACK95_FOUND FALSE)
@@ -112,7 +107,11 @@ if(_libraries_work)
set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas} ${_threads})
endif(UNIX AND BLA_STATIC)
# message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
- check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
+ if (NOT _LANGUAGES_ MATCHES Fortran)
+ check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
+ else (NOT _LANGUAGES_ MATCHES Fortran)
+ check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
+ endif (NOT _LANGUAGES_ MATCHES Fortran)
set(CMAKE_REQUIRED_LIBRARIES)
mark_as_advanced(${_prefix}${_combined_name}_WORKS)
set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
@@ -170,6 +169,7 @@ if(BLAS_FOUND)
""
"acml_mp;acml_mv"
""
+ ""
)
endif(NOT LAPACK_LIBRARIES)
endif (BLA_VENDOR STREQUAL "ACML" OR BLA_VENDOR STREQUAL "All")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e64b5daeced6ed29cc9fce252a137a097972b9ce
commit e64b5daeced6ed29cc9fce252a137a097972b9ce
Author: Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Mon Dec 27 11:37:46 2010 +0300
Commit: Alexey Ozeritsky <aozeritsky at gmail.com>
CommitDate: Mon Dec 27 11:37:46 2010 +0300
fix for Fortran-only projects
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index b605164..d57513c 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -40,7 +40,11 @@
# License text for the above reference.)
get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+if (NOT _LANGUAGES_ MATCHES Fortran)
include(CheckFunctionExists)
+else ()
+include(CheckFortranFunctionExists)
+endif()
macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _threads)
# This macro checks for the existence of the combination of fortran libraries
@@ -98,7 +102,11 @@ if(_libraries_work)
# Test this combination of libraries.
set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_threads})
# message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
- check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
+ if (_LANGUAGES_ MATCHES Fortran)
+ check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS)
+ else()
+ check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
+ endif()
set(CMAKE_REQUIRED_LIBRARIES)
mark_as_advanced(${_prefix}${_combined_name}_WORKS)
set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1279bd7bac7c9970ae1ea76744d05299232e4b04
commit 1279bd7bac7c9970ae1ea76744d05299232e4b04
Author: Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Mon Dec 27 11:14:13 2010 +0300
Commit: Alexey Ozeritsky <aozeritsky at gmail.com>
CommitDate: Mon Dec 27 11:14:13 2010 +0300
find ACML fixes
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 40effb0..f7b7ab5 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -157,11 +157,21 @@ if(BLAS_FOUND)
LAPACK
cheev
""
- "acml"
+ "acml;acml_mv"
""
""
)
endif(NOT LAPACK_LIBRARIES)
+ if(NOT LAPACK_LIBRARIES)
+ check_lapack_libraries(
+ LAPACK_LIBRARIES
+ LAPACK
+ cheev
+ ""
+ "acml_mp;acml_mv"
+ ""
+ )
+ endif(NOT LAPACK_LIBRARIES)
endif (BLA_VENDOR STREQUAL "ACML" OR BLA_VENDOR STREQUAL "All")
# Apple LAPACK library?
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBLAS.cmake | 10 +++++++++-
Modules/FindLAPACK.cmake | 34 ++++++++++++++++++++++------------
2 files changed, 31 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list