From e83c76d5610c7950fec4f75fb6a3766c80a5e58d Mon Sep 17 00:00:00 2001 From: Eli Arzhannikov Date: Thu, 31 Dec 2020 07:34:51 +0100 Subject: [boost-modular-builder] let fallback to default tool path (#15254) Co-authored-by: Ilya Arzhannikov Co-authored-by: Billy Robert O'Neal III --- ports/boost-modular-build-helper/CONTROL | 4 ++-- 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") -- cgit v1.2.3