diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-06-30 22:12:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 13:12:06 -0700 |
| commit | 098fd5af185ba4ab082f27646de09fa63cf5eb50 (patch) | |
| tree | 5178272de306e197b7c223c506b972c672716f09 | |
| parent | 5edbbf1a70a0a502e6362f51bf875b96469ed807 (diff) | |
| download | vcpkg-098fd5af185ba4ab082f27646de09fa63cf5eb50.tar.gz vcpkg-098fd5af185ba4ab082f27646de09fa63cf5eb50.zip | |
[vcpkg_configure_make] Fix mingw (cross) build issues (#18554)
* Set ENV{WINDRES} for mingw
* Fix passing of '${prefix}' for mingw cross builds
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 86b42a173..d1b87d454 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -385,6 +385,8 @@ function(vcpkg_configure_make) _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
_vcpkg_append_to_configure_environment(CONFIGURE_ENV CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
_vcpkg_append_to_configure_environment(CONFIGURE_ENV CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}")
+ _vcpkg_append_to_configure_environment(CONFIGURE_ENV RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}")
+ _vcpkg_append_to_configure_environment(CONFIGURE_ENV WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}")
if(VCPKG_DETECTED_CMAKE_AR)
_vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "${VCPKG_DETECTED_CMAKE_AR}")
else()
@@ -791,8 +793,10 @@ function(vcpkg_configure_make) unset(_link_path)
unset(_lib_env_vars)
- if(VCPKG_TARGET_IS_WINDOWS)
+ if(CMAKE_HOST_WIN32)
set(command "${base_cmd}" -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}")
+ elseif(VCPKG_TARGET_IS_WINDOWS)
+ set(command "${base_cmd}" -c "${CONFIGURE_ENV} $@" -- "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}})
else()
set(command "${base_cmd}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}})
endif()
|