Przeglądaj źródła

Merge topic 'FindPkgConfig-fix-lib-search'

2e293c39 FindPkgConfig: Fix pkg_check_modules() non-standard location search

Acked-by: Kitware Robot <[email protected]>
Merge-request: !835
Brad King 8 lat temu
rodzic
commit
cda0baea49
1 zmienionych plików z 3 dodań i 1 usunięć
  1. 3 1
      Modules/FindPkgConfig.cmake

+ 3 - 1
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(.*)")