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

[Andreas HAttel (dilfridge)]

dilfridge    11/11/22 22:15:19

  Added:                cmake-2.8.6-FindBLAS-2.patch
  Log:
  Fix logic bug in FindBLAS patch
  
  (Portage version: 2.1.10.36/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch

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

Index: cmake-2.8.6-FindBLAS-2.patch
===================================================================
diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake
--- cmake-2.8.6.orig/Modules/FindBLAS.cmake	2011-10-04 18:09:24.000000000 +0200
+++ cmake-2.8.6/Modules/FindBLAS.cmake	2011-11-22 23:04:17.000000000 +0100
@@ -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)
 
@@ -622,3 +636,6 @@
 endif(BLA_F95)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+
+endif(NOT BLAS_FOUND)
+