diff options
| author | Johannes Huber <johu@gmx.de> | 2011-10-13 13:47:50 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gmx.de> | 2011-10-13 13:47:50 +0200 |
| commit | c6c6a59796a1f07f00a86c8f25a1e399377f5f53 (patch) | |
| tree | ebd82978f1097b9f606a99c95541e6a1d9ce08aa /dev-util/cmake/files | |
| parent | 6d4cbd0d5b29bc3cf14f982fece362722bb7b2f5 (diff) | |
| download | kde-c6c6a59796a1f07f00a86c8f25a1e399377f5f53.tar.gz kde-c6c6a59796a1f07f00a86c8f25a1e399377f5f53.tar.bz2 kde-c6c6a59796a1f07f00a86c8f25a1e399377f5f53.zip | |
[dev-util/cmake] Added patches thx Arseny Solokha, bug 386919
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch | 34 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch | 34 |
2 files changed, 68 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch new file mode 100644 index 00000000000..75b2814b9a0 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch @@ -0,0 +1,34 @@ +--- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-09 23:32:55.096356973 +0800 ++++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-10-09 23:35:10.235667390 +0800 +@@ -1,3 +1,9 @@ ++# ++# Version modified for Gentoo Linux ++# If a valid PkgConfig configuration for blas is found, this overrides and cancels ++# all further checks. ++# ++ + # - Find BLAS library + # This module finds an installed fortran library that implements the BLAS + # linear-algebra interface (see http://www.netlib.org/blas/). +@@ -39,6 +45,14 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++# ++# first, try PkgConfig ++# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(BLAS blas) ++if(NOT BLAS_FOUND) ++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") ++ + include(CheckFunctionExists) + include(CheckFortranFunctionExists) + +@@ -621,4 +635,6 @@ + endif(NOT BLAS_FIND_QUIETLY) + endif(BLA_F95) + ++endif(NOT BLAS_FOUND) ++ + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch new file mode 100644 index 00000000000..d1f3a96dac1 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch @@ -0,0 +1,34 @@ +--- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800 ++++ cmake-2.8.6/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800 +@@ -1,3 +1,9 @@ ++# ++# Version modified for Gentoo Linux ++# If a valid PkgConfig configuration is found, this overrides and cancels ++# all further checks. ++# ++ + # - Find LAPACK library + # This module finds an installed fortran library that implements the LAPACK + # linear-algebra interface (see http://www.netlib.org/lapack/). +@@ -36,6 +42,14 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++# ++# first, try PkgConfig ++# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LAPACK lapack) ++if(NOT LAPACK_FOUND) ++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") ++ + set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + + get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) +@@ -304,4 +318,6 @@ + endif(NOT LAPACK_FIND_QUIETLY) + endif(BLA_F95) + ++endif(NOT LAPACK_FOUND) ++ + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |