johu        14/09/15 22:43:29

  Added:                cmake-3.0.2-FindLAPACK.patch
  Removed:              cmake-3.0.0-FindLAPACK.patch
  Log:
  Version bump, adds updated patch for FindLAPACK module by Eugene Shalygin 
<[email protected]>, bug #518910. Remove old.
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 
F3CFD2BD)

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

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

Index: cmake-3.0.2-FindLAPACK.patch
===================================================================
--- Modules/FindLAPACK.cmake.orig       2014-09-15 23:50:11.377111987 +0200
+++ Modules/FindLAPACK.cmake    2014-09-15 23:52:54.734388375 +0200
@@ -4,6 +4,10 @@
 #
 # Find LAPACK library
 #
+# Version modified for Gentoo Linux.
+# If a valid PkgConfig configuration is found, this overrides and cancels
+# all further checks.
+#
 # This module finds an installed fortran library that implements the
 # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
 #
@@ -140,6 +144,23 @@
 
 endmacro()
 
+#
+# first, try PkgConfig
+#
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(PC_LAPACK lapack)
+if(PC_LAPACK_FOUND)
+  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS 
${PC_LAPACK_LIBRARY_DIRS} )
+    if (NOT ${PC_LIB}_LIBRARY)
+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib 
${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
+    endif (NOT ${PC_LIB}_LIBRARY)
+    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
+  endforeach(PC_LIB)
+  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
+  mark_as_advanced(LAPACK_LIBRARIES)
+else(PC_LAPACK_FOUND)
+message(STATUS "No PkgConfig configuration for LAPACK found; starting more 
extensive search.")
 
 set(LAPACK_LINKER_FLAGS)
 set(LAPACK_LIBRARIES)
@@ -348,3 +369,5 @@
 endif()
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+
+endif(PC_LAPACK_FOUND)




Reply via email to