diff options
| author | Todor Prokopov <koprok@users.noreply.github.com> | 2020-06-05 22:28:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 12:28:42 -0700 |
| commit | cb8a9fe7157f8ad2423742f893955ed9ced05910 (patch) | |
| tree | cb73f1a2c9f384a860999b044f321730e2244981 /ports/boost-modular-build-helper/boost-modular-build.cmake | |
| parent | b800df0e3bd3f3bc7f0903506e1ea62fec8e3db6 (diff) | |
| download | vcpkg-cb8a9fe7157f8ad2423742f893955ed9ced05910.tar.gz vcpkg-cb8a9fe7157f8ad2423742f893955ed9ced05910.zip | |
[boost] MinGW build fixes (#11427)
Diffstat (limited to 'ports/boost-modular-build-helper/boost-modular-build.cmake')
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index d166a35ca..a70363ee4 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -19,7 +19,7 @@ function(boost_modular_build) # Todo: this serves too similar a purpose as vcpkg_find_acquire_program()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x64-linux/tools/boost-build")
- elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")
get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)
elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)
|