mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 18:32:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[boost-modular-build-helper] Use boost's correct .jam file. (#22274)

Browse Source 
* Use boost's correct .jam file.

Use boost's clang-win.jam configuration file when using Clang-cl to allow cross-compilation for Windows.

* Update port-version.

* Clang seems fine here.

* Run vcpkg x-add-version boost-modular-build-helper

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* Run vcpkg x-add-version --overwrite-version boost-modular-build-helper

Co-authored-by: Nemirtingas <nanaki89@hotmail.fr>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
This commit is contained in:
Nemirtingas 2022-01-06 22:55:02 +01:00 committed by GitHub
parent 9117f195fa
commit 5be51c9516
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ports/boost-modular-build-helper/CMakeLists.txt
View File

@ -51,25 +51,38 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32)
list(APPEND B2_OPTIONS "asmflags=/safeseh") list(APPEND B2_OPTIONS "asmflags=/safeseh")
endif() endif()
if(MSVC) if(WIN32)
set(USER_CONFIG_TOOLSET msvc) if(MSVC)
if(MSVC_VERSION LESS 1900) if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60") set(USER_CONFIG_TOOLSET clang-win)
else()
set(USER_CONFIG_TOOLSET msvc)
endif()
if(MSVC_VERSION LESS 1900)
math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60")
else()
math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50")
endif()
else() else()
math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(USER_CONFIG_TOOLSET clang)
else()
set(USER_CONFIG_TOOLSET gcc)
endif()
endif() endif()
list(APPEND B2_OPTIONS target-os=windows) list(APPEND B2_OPTIONS target-os=windows)
elseif(APPLE) elseif(APPLE)
set(USER_CONFIG_TOOLSET clang) set(USER_CONFIG_TOOLSET clang)
list(APPEND B2_OPTIONS target-os=darwin) list(APPEND B2_OPTIONS target-os=darwin)
elseif(WIN32)
set(USER_CONFIG_TOOLSET gcc)
list(APPEND B2_OPTIONS target-os=windows)
elseif(ANDROID) elseif(ANDROID)
set(USER_CONFIG_TOOLSET gcc) set(USER_CONFIG_TOOLSET gcc)
list(APPEND B2_OPTIONS target-os=android) list(APPEND B2_OPTIONS target-os=android)
else() else()
set(USER_CONFIG_TOOLSET gcc) if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(USER_CONFIG_TOOLSET clang)
else()
set(USER_CONFIG_TOOLSET gcc)
endif()
list(APPEND B2_OPTIONS target-os=linux) list(APPEND B2_OPTIONS target-os=linux)
endif() endif()

2
ports/boost-modular-build-helper/user-config.jam.in
View File

@ -17,7 +17,7 @@ if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel"
project user-config : ; project user-config : ;
if "@USER_CONFIG_TOOLSET@" = "msvc" if "@USER_CONFIG_TOOLSET@" = "msvc" || "@USER_CONFIG_TOOLSET@" = "clang-win"
{ {
lib advapi32 ; lib advapi32 ;

2
ports/boost-modular-build-helper/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "boost-modular-build-helper", "name": "boost-modular-build-helper",
"version": "1.77.0", "version": "1.77.0",
"port-version": 4, "port-version": 5,
"description": "Internal vcpkg port used to build Boost libraries", "description": "Internal vcpkg port used to build Boost libraries",
"dependencies": [ "dependencies": [
"boost-uninstall" "boost-uninstall"

5
versions/b-/boost-modular-build-helper.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "48cc9da813626ac4733698e65368e5581f4efb59",
"version": "1.77.0",
"port-version": 5
},
{ {
"git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa", "git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa",
"version": "1.77.0", "version": "1.77.0",

2
versions/baseline.json
View File

@ -826,7 +826,7 @@
}, },
"boost-modular-build-helper": { "boost-modular-build-helper": {
"baseline": "1.77.0", "baseline": "1.77.0",
"port-version": 4 "port-version": 5
}, },
"boost-move": { "boost-move": {
"baseline": "1.77.0", "baseline": "1.77.0",