|
@@ -403,6 +403,14 @@ macro(_pkg_set_path_internal)
|
|
|
unset(_lib_dirs)
|
|
unset(_lib_dirs)
|
|
|
unset(_pkgconfig_path)
|
|
unset(_pkgconfig_path)
|
|
|
endif()
|
|
endif()
|
|
|
|
|
+
|
|
|
|
|
+ # Tell pkg-config not to strip any -L paths so we can search them all.
|
|
|
|
|
+ if(DEFINED ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS})
|
|
|
|
|
+ set(_pkgconfig_allow_system_libs_old "$ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}")
|
|
|
|
|
+ else()
|
|
|
|
|
+ unset(_pkgconfig_allow_system_libs_old)
|
|
|
|
|
+ endif()
|
|
|
|
|
+ set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} 0)
|
|
|
endmacro()
|
|
endmacro()
|
|
|
|
|
|
|
|
macro(_pkg_restore_path_internal)
|
|
macro(_pkg_restore_path_internal)
|
|
@@ -410,6 +418,10 @@ macro(_pkg_restore_path_internal)
|
|
|
# Restore the environment variable
|
|
# Restore the environment variable
|
|
|
set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
|
|
set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
|
|
|
endif()
|
|
endif()
|
|
|
|
|
+ if(DEFINED _pkgconfig_allow_system_libs_old)
|
|
|
|
|
+ set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} "${_pkgconfig_allow_system_libs_old}")
|
|
|
|
|
+ unset(_pkgconfig_allow_system_libs_old)
|
|
|
|
|
+ endif()
|
|
|
|
|
|
|
|
unset(_extra_paths)
|
|
unset(_extra_paths)
|
|
|
unset(_pkgconfig_path_old)
|
|
unset(_pkgconfig_path_old)
|