diff options
| author | Eli Arzhannikov <iarzhannikov@artec-group.com> | 2020-12-31 07:34:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 22:34:51 -0800 |
| commit | e83c76d5610c7950fec4f75fb6a3766c80a5e58d (patch) | |
| tree | 6d4ffec599e6996fff11bc99e5793016ac6f880e | |
| parent | 5c262f63ec509a733dd67db71c0959e8842e0091 (diff) | |
| download | vcpkg-e83c76d5610c7950fec4f75fb6a3766c80a5e58d.tar.gz vcpkg-e83c76d5610c7950fec4f75fb6a3766c80a5e58d.zip | |
[boost-modular-builder] let fallback to default tool path (#15254)
Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 4 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 731ee7f63..d59e7580a 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,4 +1,4 @@ Source: boost-modular-build-helper
Version: 1.75.0
-Port-Version: 1
-Build-Depends: boost-uninstall
\ No newline at end of file +Port-Version: 2
+Build-Depends: boost-uninstall
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 48452422b..481dfd510 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -27,7 +27,7 @@ function(boost_modular_build) set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../arm-linux/tools/boost-build")
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" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x")
+ elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x" AND CMAKE_HOST_WIN32)
get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)
else()
set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/tools/boost-build")
|