diff options
| author |   Johannes Huber <johu@gentoo.org> | 2014-09-15 22:43:37 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-09-15 22:43:37 +0000 |
| commit | 30831207955bf0375fcaf094f2bd23453d53f741 (patch) | |
| tree | ac592d3494c1ab1799954a6f582b0de00b1b1241 /dev-util/cmake/files | |
| parent | Mask zrtpcpp-4 since it is screwed up. (diff) | |
| download | historical-30831207955bf0375fcaf094f2bd23453d53f741.tar.gz historical-30831207955bf0375fcaf094f2bd23453d53f741.tar.bz2 historical-30831207955bf0375fcaf094f2bd23453d53f741.zip | |
Version bump, adds updated patch for FindLAPACK module by Eugene Shalygin <eugene.shalygin@gmail.com>, bug #518910. Remove old.
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch (renamed from dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch) | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch index 611c5ceb94f7..57250e453be0 100644 --- a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch +++ b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch @@ -1,5 +1,5 @@ ---- Modules/FindLAPACK.cmake -+++ Modules/FindLAPACK.cmake +--- 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 @@ -11,9 +11,9 @@ # This module finds an installed fortran library that implements the # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). # -@@ -72,6 +76,24 @@ - # N.B. _prefix is the prefix applied to the names of all cached variables that - # are generated internally and marked advanced by this macro. +@@ -140,6 +144,23 @@ + + endmacro() +# +# first, try PkgConfig @@ -26,17 +26,16 @@ + 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}) ++ 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(_libraries_work TRUE) - set(${LIBRARIES}) - set(_combined_name) -@@ -348,3 +370,5 @@ + + set(LAPACK_LINKER_FLAGS) + set(LAPACK_LIBRARIES) +@@ -348,3 +369,5 @@ endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |