diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2012-03-26 16:45:04 +0200 |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2012-07-21 10:15:52 +0200 |
| commit | af80da349bb259ccccac146cdd734afeedeec116 (patch) | |
| tree | b46e9273434c2f3b40010c445301dbc47a36a10a | |
| parent | 733726edf61aa7889b57aa9490cb719c83d3ea0f (diff) | |
| download | cmake-af80da349bb259ccccac146cdd734afeedeec116.tar.gz | |
remove lib64 Unix paths if the respective lib path is also given
If FIND_LIBRARY_USE_LIB64_PATHS is set both will be searched anyway.
| -rw-r--r-- | Modules/FindBLAS.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindGTK2.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 9eadfd125d..5811a9d15e 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -81,9 +81,9 @@ if (NOT _libdir) if (WIN32) set(_libdir ENV LIB) elseif (APPLE) - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) + set(_libdir ENV DYLD_LIBRARY_PATH) else () - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) + set(_libdir ENV LD_LIBRARY_PATH) endif () endif () diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index a03c023e44..5fe52134ac 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -305,9 +305,7 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) NAMES ${_lib_list} PATHS /opt/gnome/lib - /opt/gnome/lib64 /usr/openwin/lib - /usr/openwin/lib64 /sw/lib $ENV{GTKMM_BASEPATH}/lib [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index 0ae98dfa7b..b867f21333 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -69,9 +69,9 @@ if (NOT _libdir) if (WIN32) set(_libdir ENV LIB) elseif (APPLE) - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) + set(_libdir ENV DYLD_LIBRARY_PATH) else () - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) + set(_libdir ENV LD_LIBRARY_PATH) endif () endif () foreach(_library ${_list}) |