You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.2 KiB
27 lines
1.2 KiB
--- ./Modules/FindPkgConfig.cmake.msys 2017-05-31 16:00:09.000000000 +0200
|
|
+++ ./Modules/FindPkgConfig.cmake 2018-10-03 16:43:37.880991800 +0200
|
|
@@ -345,6 +345,24 @@ macro(_pkg_check_modules_internal _is_re
|
|
unset(_pkgconfig_path)
|
|
endif()
|
|
|
|
+ if (CYGWIN OR MSYS)
|
|
+ find_program(_cygpath_exe cygpath.exe NO_CMAKE_ENVIRONMENT_PATH)
|
|
+ if(_cygpath_exe)
|
|
+ # fix the PKG_CONFIG_PATH transformed into a cmake path with incorrect msys pathes
|
|
+ file(TO_CMAKE_PATH "$ENV{PKG_CONFIG_PATH}" _pkgconfig_path_cmake)
|
|
+ execute_process(
|
|
+ COMMAND ${_cygpath_exe} "-up" "${_pkgconfig_path_cmake}"
|
|
+ RESULT_VARIABLE _cygpath_retval
|
|
+ OUTPUT_VARIABLE _cygpath_outval
|
|
+ ERROR_VARIABLE _cygpath_error
|
|
+ OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
+ ERROR_STRIP_TRAILING_WHITESPACE)
|
|
+ if (_cygpath_outval)
|
|
+ set(ENV{PKG_CONFIG_PATH} ${_cygpath_outval})
|
|
+ endif()
|
|
+ endif()
|
|
+ endif()
|
|
+
|
|
# iterate through module list and check whether they exist and match the required version
|
|
foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
|
|
set(_pkg_check_modules_exist_query)
|
|
|