diff options
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 4 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 54572f0..12a5ded 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -190,10 +190,12 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat string(APPEND _find_opts " NO_CMAKE_ENVIRONMENT_PATH") endif() + unset(_search_paths) foreach (flag IN LISTS ${_prefix}_LDFLAGS) if (flag MATCHES "^-L(.*)") # only look into the given paths from now on - set(_find_opts HINTS ${CMAKE_MATCH_1} NO_DEFAULT_PATH) + list(APPEND _search_paths ${CMAKE_MATCH_1}) + set(_find_opts HINTS ${_search_paths} NO_DEFAULT_PATH) continue() endif() if (flag MATCHES "^-l(.*)") diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e2a2a84..dea8b6d 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 8) -set(CMake_VERSION_PATCH 20170514) +set(CMake_VERSION_PATCH 20170515) #set(CMake_VERSION_RC 1) |