[gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.5-FindLAPACK.patch cmake-2.8.5-FindBLAS.patch

[gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.5-FindLAPACK.patch cmake-2.8.5-FindBLAS.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/07/18 09:03:45

  Added:                cmake-2.8.5-FindLAPACK.patch
                        cmake-2.8.5-FindBLAS.patch
  Log:
  Patch FindBLAS and FindLAPACK to try PkgConfig first and skip all other tests if that succeeds; prepare for additional eclass feature of automated cmake module removal in $S, which should NOT happen in the cmake ebuild itself.
  
  (Portage version: 2.1.10.5/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch?rev=1.1&content-type=text/plain

Index: cmake-2.8.5-FindLAPACK.patch
===================================================================
diff -ruN cmake-2.8.5.orig/Modules/FindLAPACK.cmake cmake-2.8.5/Modules/FindLAPACK.cmake
--- cmake-2.8.5.orig/Modules/FindLAPACK.cmake	2011-07-08 14:21:44.000000000 +0200
+++ cmake-2.8.5/Modules/FindLAPACK.cmake	2011-07-17 19:46:57.865560858 +0200
@@ -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.")
+
 get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
 if (NOT _LANGUAGES_ MATCHES Fortran)
 include(CheckFunctionExists)
@@ -300,3 +314,5 @@
   endif(LAPACK_FOUND)
  endif(NOT LAPACK_FIND_QUIETLY)
 endif(BLA_F95)
+
+endif(NOT LAPACK_FOUND)



1.1                  dev-util/cmake/files/cmake-2.8.5-FindBLAS.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.5-FindBLAS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.5-FindBLAS.patch?rev=1.1&content-type=text/plain

Index: cmake-2.8.5-FindBLAS.patch
===================================================================
diff -ruN cmake-2.8.5.orig/Modules/FindBLAS.cmake cmake-2.8.5/Modules/FindBLAS.cmake
--- cmake-2.8.5.orig/Modules/FindBLAS.cmake	2011-07-08 14:21:44.000000000 +0200
+++ cmake-2.8.5/Modules/FindBLAS.cmake	2011-07-17 17:34:45.384557963 +0200
@@ -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)
 
@@ -559,3 +573,6 @@
     endif(BLAS_FOUND)
   endif(NOT BLAS_FIND_QUIETLY)
 endif(BLA_F95)
+
+
+endif(NOT BLAS_FOUND)