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 | |
| parent | b800df0e3bd3f3bc7f0903506e1ea62fec8e3db6 (diff) | |
| download | vcpkg-cb8a9fe7157f8ad2423742f893955ed9ced05910.tar.gz vcpkg-cb8a9fe7157f8ad2423742f893955ed9ced05910.zip | |
[boost] MinGW build fixes (#11427)
| -rw-r--r-- | ports/boost-build/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-build/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index ddeebcd13..087970dea 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,4 +1,4 @@ Source: boost-build
-Version: 1.73.0
+Version: 1.73.0-1
Homepage: https://github.com/boostorg/build
Description: Boost.Build
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 5823afc4e..7633f51aa 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,7 +4,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
return()
-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")
return()
endif()
@@ -52,8 +52,13 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/tools/boost-build/src/tools/msvc.jam" "${_co message(STATUS "Bootstrapping...")
if(CMAKE_HOST_WIN32)
+ if(VCPKG_TARGET_IS_MINGW)
+ set(TOOLSET mingw)
+ else()
+ set(TOOLSET msvc)
+ endif()
vcpkg_execute_required_process(
- COMMAND "${CURRENT_PACKAGES_DIR}/tools/boost-build/bootstrap.bat" msvc
+ COMMAND "${CURRENT_PACKAGES_DIR}/tools/boost-build/bootstrap.bat" ${TOOLSET}
WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boost-build
LOGNAME bootstrap-${TARGET_TRIPLET}
)
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index ef33db882..05a1762a0 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -83,7 +83,7 @@ if(NOT LDLAGS STREQUAL "") endif()
#set(CXXFLAGS "${CXXFLAGS} <compileflags>-Wno-error=unused-command-line-argument")
-if(CMAKE_CXX_COMPILER_TARGET)
+if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
else()
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 926524085..79cc74ccd 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper
-Version: 1.73.0
+Version: 1.73.0-1
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)
|