[Boost] use cmake build (#32309)

~~arm64-windows: boost-context builds are blocked by a cmake bug (see
https://gitlab.kitware.com/cmake/cmake/-/issues/24317)~~

closes #32274
closes https://github.com/Neumann-A/my-vcpkg-triplets/issues/5

Questions:
- [x] ~~Move cmake files to `share/cmake/<name>` ?~~ Not doing it
because it is just using `vcpkg_cmake_config_fixup()`
- [x] Fix weak dependencies (uwp|emscripten|android|arm)?
- [x] Fix library names on !x64 (currently hardcoded to x64 or x86;
failure in aricpp since it forces FindBoost module mode.)
- [x] ~~Fix arm64-windows boost-context builds -> requires CMake
(3.19.2?) update due to bug how the assembler is invoked.~~ (-> CI
baseline for now)

TODO:
- [x] adjust generate ports script
- [x] #37457

---------

Co-authored-by: Cheney-Wang <850426846@qq.com>
This commit is contained in:
Alexander Neumann 2024-04-29 21:27:41 +02:00 committed by GitHub
parent dcfbe90ecb
commit bcf3d00d21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
536 changed files with 3879 additions and 2708 deletions

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-accumulators",
"version": "1.84.0",
"port-version": 1,
"description": "Boost accumulators module",
"homepage": "https://github.com/boostorg/accumulators",
"license": "BSL-1.0",
@ -18,6 +19,10 @@
"name": "boost-circular-buffer",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-concept-check",
"version>=": "1.84.0"
@ -34,6 +39,10 @@
"name": "boost-fusion",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-iterator",
"version>=": "1.84.0"
@ -85,10 +94,6 @@
{
"name": "boost-ublas",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-algorithm",
"version": "1.84.0",
"port-version": 1,
"description": "Boost algorithm module",
"homepage": "https://github.com/boostorg/algorithm",
"license": "BSL-1.0",
@ -18,6 +19,10 @@
"name": "boost-bind",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-concept-check",
"version>=": "1.84.0"
@ -38,6 +43,10 @@
"name": "boost-function",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-iterator",
"version>=": "1.84.0"
@ -73,10 +82,6 @@
{
"name": "boost-unordered",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-align",
"version": "1.84.0",
"port-version": 1,
"description": "Boost align module",
"homepage": "https://github.com/boostorg/align",
"license": "BSL-1.0",
@ -10,6 +11,10 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -19,11 +24,11 @@
"version>=": "1.84.0"
},
{
"name": "boost-static-assert",
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-static-assert",
"version>=": "1.84.0"
}
]

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-any",
"version": "1.84.0",
"port-version": 1,
"description": "Boost any module",
"homepage": "https://github.com/boostorg/any",
"license": "BSL-1.0",
@ -10,10 +11,18 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
@ -21,10 +30,6 @@
{
"name": "boost-type-index",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-array",
"version": "1.84.0",
"port-version": 1,
"description": "Boost array module",
"homepage": "https://github.com/boostorg/array",
"license": "BSL-1.0",
@ -10,6 +11,10 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -18,6 +23,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-static-assert",
"version>=": "1.84.0"
@ -25,10 +34,6 @@
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ad3c1de2f..c918c7707d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,13 +17,21 @@ target_link_libraries(boost_asio
Boost::align
Boost::assert
Boost::config
- Boost::context
- Boost::coroutine
+ $<TARGET_NAME_IF_EXISTS:Boost::context>
+ $<TARGET_NAME_IF_EXISTS:Boost::coroutine>
Boost::date_time
Boost::system
Boost::throw_exception
)
+if(NOT TARGET Boost::context)
+ target_compile_definitions(boost_asio INTERFACE $<$<NOT:$<TARGET_EXISTS:Boost::context>>:BOOST_ASIO_DISABLE_BOOST_CONTEXT_FIBER>)
+endif()
+
+if(NOT TARGET Boost::coroutine)
+ target_compile_definitions(boost_asio INTERFACE $<$<NOT:$<TARGET_EXISTS:Boost::coroutine>>:BOOST_ASIO_DISABLE_BOOST_COROUTINE>)
+endif()
+
target_compile_features(boost_asio INTERFACE cxx_std_11)
if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")

View File

@ -6,8 +6,13 @@ vcpkg_from_github(
REF boost-${VERSION}
SHA512 88d1d8d1bbea29149d9747ab9ccb99a7bfbd928f8ed1aff90adb6382fcefd32dc9687e6832f8ac21ddf918f0608623aa123d7943aa5f697a6b946fe2311e05f6
HEAD_REF master
PATCHES windows_alloca_header.patch
PATCHES
windows_alloca_header.patch
opt-dep.diff
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-asio",
"version": "1.84.0",
"port-version": 1,
"description": "Boost asio module",
"homepage": "https://github.com/boostorg/asio",
"license": "BSL-1.0",
@ -14,6 +15,10 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -32,6 +37,10 @@
"name": "boost-date-time",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-system",
"version>=": "1.84.0"
@ -39,10 +48,6 @@
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
],
"features": {

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,16 +2,21 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-assert",
"version": "1.84.0",
"port-version": 1,
"description": "Boost assert module",
"homepage": "https://github.com/boostorg/assert",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-headers",
"version>=": "1.84.0"
}
]

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-assign",
"version": "1.84.0",
"port-version": 1,
"description": "Boost assign module",
"homepage": "https://github.com/boostorg/assign",
"license": "BSL-1.0",
@ -10,6 +11,10 @@
"name": "boost-array",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -18,6 +23,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-move",
"version>=": "1.84.0"
@ -49,10 +58,6 @@
{
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf6dc658f2..4e976a3676 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,8 @@ find_package(Threads REQUIRED)
# official monolithic Boost distribution tree).
include(cmake/BoostLibraryIncludes.cmake)
+list(APPEND BOOST_LIBRARY_INCLUDES "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+
set(boost_atomic_sources src/lock_pool.cpp)
set(CMAKE_REQUIRED_INCLUDES ${BOOST_LIBRARY_INCLUDES})

View File

@ -6,16 +6,13 @@ vcpkg_from_github(
REF boost-${VERSION}
SHA512 1d1a484a070d25724f084287e321a56a191373bf5387158a0e055d870056d0ad04d37596008c19a52469d823a7c4721fb682fc1870e583effa5061cea6571097
HEAD_REF master
PATCHES
fix-include.patch
)
file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
string(REPLACE "import config : requires" "import ../config/checks/config : requires" _contents "${_contents}")
string(REPLACE "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" _contents "${_contents}")
file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
# has_synchronization_lib.cpp is used in boost-modular-build-helper/Jamroot.jam.in
file(COPY "${SOURCE_PATH}/config/has_synchronization_lib.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-atomic")
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-atomic",
"version": "1.84.0",
"port-version": 1,
"description": "Boost atomic module",
"homepage": "https://github.com/boostorg/atomic",
"license": "BSL-1.0",
@ -15,8 +16,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -24,8 +24,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-headers",
"version>=": "1.84.0"
},
{
@ -40,17 +39,9 @@
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "boost-winapi",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-beast",
"version": "1.84.0",
"port-version": 1,
"description": "Boost beast module",
"homepage": "https://github.com/boostorg/beast",
"license": "BSL-1.0",
@ -19,6 +20,10 @@
"name": "boost-bind",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -39,6 +44,10 @@
"name": "boost-endian",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-intrusive",
"version>=": "1.84.0"
@ -87,10 +96,6 @@
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "boost-winapi",
"version>=": "1.84.0"

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,10 +2,15 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-bimap",
"version": "1.84.0",
"port-version": 1,
"description": "Boost bimap module",
"homepage": "https://github.com/boostorg/bimap",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-concept-check",
"version>=": "1.84.0"
@ -22,6 +27,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-iterator",
"version>=": "1.84.0"
@ -57,10 +66,6 @@
{
"name": "boost-utility",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,10 +2,15 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-bind",
"version": "1.84.0",
"port-version": 1,
"description": "Boost bind module",
"homepage": "https://github.com/boostorg/bind",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -15,7 +20,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-headers",
"version>=": "1.84.0"
}
]

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-build",
"version": "1.84.0",
"port-version": 1,
"description": "Boost.Build",
"homepage": "https://github.com/boostorg/build",
"license": "BSL-1.0",

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,16 +2,21 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-callable-traits",
"version": "1.84.0",
"port-version": 1,
"description": "Boost callable_traits module",
"homepage": "https://github.com/boostorg/callable_traits",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-headers",
"version>=": "1.84.0"
}
]

View File

@ -8,7 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-chrono",
"version": "1.84.0",
"port-version": 1,
"description": "Boost chrono module",
"homepage": "https://github.com/boostorg/chrono",
"license": "BSL-1.0",
@ -11,8 +12,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -24,12 +24,11 @@
"version>=": "1.84.0"
},
{
"name": "boost-integer",
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-integer",
"version>=": "1.84.0"
},
{
@ -72,17 +71,9 @@
"name": "boost-utility",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "boost-winapi",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-circular-buffer",
"version": "1.84.0",
"port-version": 1,
"description": "Boost circular_buffer module",
"homepage": "https://github.com/boostorg/circular_buffer",
"license": "BSL-1.0",
@ -10,6 +11,10 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-concept-check",
"version>=": "1.84.0"
@ -22,6 +27,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-move",
"version>=": "1.84.0"
@ -37,10 +46,6 @@
{
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -0,0 +1,14 @@
cmake_minimum_required(VERSION 3.21)
include(CMakePackageConfigHelpers)
project(Boost VERSION @VERSION@ LANGUAGES NONE)
set(CONFIG_VERSION_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/tmpinst/BoostConfigVersion.cmake")
write_basic_package_version_file("${CONFIG_VERSION_FILE_NAME}" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)
install(FILES
"${CONFIG_VERSION_FILE_NAME}"
"${CMAKE_CURRENT_SOURCE_DIR}/config/BoostConfig.cmake"
DESTINATION "share/boost")

View File

@ -0,0 +1,55 @@
diff --git a/include/BoostInstall.cmake b/include/BoostInstall.cmake
index f9342f1715..a6bd9c349a 100644
--- a/include/BoostInstall.cmake
+++ b/include/BoostInstall.cmake
@@ -315,6 +315,12 @@ function(boost_install_target)
string(APPEND CONFIG_FILE_CONTENTS " find_dependency(boost_${CMAKE_MATCH_1} ${__VERSION} EXACT)\n")
string(APPEND CONFIG_FILE_CONTENTS "endif()\n")
+ elseif(dep MATCHES "^\\$<TARGET_NAME_IF_EXISTS:Boost::(.*)>$")
+
+ string(APPEND CONFIG_FILE_CONTENTS "if(NOT boost_${CMAKE_MATCH_1}_FOUND)\n")
+ string(APPEND CONFIG_FILE_CONTENTS " find_package(boost_${CMAKE_MATCH_1} ${__VERSION} EXACT QUIET)\n")
+ string(APPEND CONFIG_FILE_CONTENTS "endif()\n")
+
elseif(dep STREQUAL "Threads::Threads")
string(APPEND CONFIG_FILE_CONTENTS "set(THREADS_PREFER_PTHREAD_FLAG ON)\n")
diff --git a/include/BoostRoot.cmake b/include/BoostRoot.cmake
index f356666739..1843f528cd 100644
--- a/include/BoostRoot.cmake
+++ b/include/BoostRoot.cmake
@@ -189,6 +189,7 @@ function(__boost_scan_dependencies lib var)
set(result "")
set(required_components "")
+ set(optional_components "")
if(EXISTS "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs/${lib}/CMakeLists.txt")
@@ -202,6 +203,12 @@ function(__boost_scan_dependencies lib var)
string(REGEX REPLACE "^numeric_" "numeric/" dep ${CMAKE_MATCH_1})
list(APPEND result ${dep})
+ elseif(line MATCHES "^[ ]*$<TARGET_NAME_IF_EXISTS:Boost::([A-Za-z0-9_]+)>[ ]*$")
+
+ list(APPEND optional_components ${CMAKE_MATCH_1})
+ string(REGEX REPLACE "^numeric_" "numeric/" dep ${CMAKE_MATCH_1})
+ list(APPEND result ${dep})
+
endif()
endforeach()
@@ -209,9 +216,10 @@ function(__boost_scan_dependencies lib var)
endif()
list(REMOVE_DUPLICATES required_components)
+ list(REMOVE_DUPLICATES optional_components)
list(REMOVE_ITEM required_components boost ${lib}) # due to property_tree and python
- if(required_components)
+ if(required_components OR optional_components)
- find_package(Boost COMPONENTS ${required_components} REQUIRED CONFIG)
+ find_package(Boost COMPONENTS ${required_components} OPTIONAL_COMPONENTS ${optional_components} REQUIRED CONFIG)
endif()
set(${var} ${result} PARENT_SCOPE)

View File

@ -0,0 +1,38 @@
diff --git a/include/BoostInstall.cmake b/include/BoostInstall.cmake
index 3a00c16..069dde0 100644
--- a/include/BoostInstall.cmake
+++ b/include/BoostInstall.cmake
@@ -152,7 +152,31 @@ function(__boost_install_set_output_name LIB TYPE VERSION)
# Arch and model
math(EXPR bits ${CMAKE_SIZEOF_VOID_P}*8)
- string(APPEND name_debug "-x${bits}") # x86 only for now
- string(APPEND name_release "-x${bits}")
+ set(arch "x")
+
+ if(MSVC)
+
+ if(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "^ARM")
+ set(arch "a")
+ endif()
+
+ else()
+
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^[Aa][Rr][Mm]"
+ OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch")
+ set(arch "a")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+ set(arch "m")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i(3|6)86")
+ set(arch "x")
+ else()
+ string(SUBSTRING "${CMAKE_SYSTEM_PROCESSOR}" 0 1 arch)
+ string(TOLOWER "${arch}" arch)
+ endif()
+
+ endif()
+
+ string(APPEND name_debug "-${arch}${bits}")
+ string(APPEND name_release "-${arch}${bits}")
endif()

View File

@ -0,0 +1,18 @@
diff --git a/include/BoostInstall.cmake b/include/BoostInstall.cmake
index 47f3eb756e..49c0086fea 100644
--- a/include/BoostInstall.cmake
+++ b/include/BoostInstall.cmake
@@ -336,6 +336,13 @@ function(boost_install_target)
string(APPEND CONFIG_FILE_CONTENTS "find_dependency(zstd)\n")
+ elseif(dep STREQUAL "MPI::MPI_C")
+
+ # COMPONENTS requires 3.9, but the imported target also requires 3.9
+ string(APPEND CONFIG_FILE_CONTENTS "enable_language(C)\n")
+ string(APPEND CONFIG_FILE_CONTENTS "find_dependency(MPI COMPONENTS C)\n")
+
+
elseif(dep STREQUAL "MPI::MPI_CXX")
# COMPONENTS requires 3.9, but the imported target also requires 3.9

View File

@ -0,0 +1,13 @@
diff --git a/include/BoostInstall.cmake b/include/BoostInstall.cmake
index 49c0086fea..ad16dc5e0a 100644
--- a/include/BoostInstall.cmake
+++ b/include/BoostInstall.cmake
@@ -69,7 +69,7 @@ function(__boost_install_set_output_name LIB TYPE VERSION)
# prefix
if(WIN32 AND TYPE STREQUAL "STATIC_LIBRARY")
- set_target_properties(${LIB} PROPERTIES PREFIX "lib")
+ #set_target_properties(${LIB} PROPERTIES PREFIX "lib")
endif()
# toolset

View File

@ -0,0 +1,42 @@
set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
include("${CMAKE_CURRENT_LIST_DIR}/ref_sha.cmake")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH_SUPER
REPO boostorg/boost
REF ${boost_boost_ref}
SHA512 ${boost_boost_sha512}
HEAD_REF master
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH_CMAKE
REPO boostorg/cmake
REF ${boost_cmake_ref}
SHA512 ${boost_cmake_sha512}
HEAD_REF master
PATCHES
"vcpkg-build.diff"
"fix-mpi.diff"
"no-prefix.diff"
"zstd.diff"
"add-optional-deps.diff"
"fix-missing-archs.diff"
)
configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" "${SOURCE_PATH_CMAKE}/CMakeLists.txt" @ONLY)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH_CMAKE}")
vcpkg_cmake_install()
file(INSTALL "${SOURCE_PATH_CMAKE}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost/cmake-build")
file(INSTALL
"${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH_SUPER}/LICENSE_1_0.txt")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")

View File

@ -0,0 +1,4 @@
set(boost_boost_ref boost-${VERSION})
set(boost_boost_sha512 a868fde0323debb369c40757538f98c3d6e742f01ae8b7e6c12d46b9ddc4fa32bb7f5797e6ec1f57cd0730d7f5583aafe776a855fcbe08af125f1b258cd6536a)
set(boost_cmake_ref boost-${VERSION})
set(boost_cmake_sha512 f00d70a383bc6200409536db1b0ea6680002b2e4383e0f9c2ba1774ddbc5d1c6a0930fd6cbca76d99be9d010b27803f95bf8afdb367d3f68a6ad0c4afea4fae1)

View File

@ -1,4 +1,4 @@
The package boost is compatible with built-in CMake targets:
All boost packages are compatible with built-in CMake targets of FindBoost.cmake:
find_package(Boost REQUIRED [COMPONENTS <libs>...])
target_link_libraries(main PRIVATE Boost::boost Boost::<lib1> Boost::<lib2> ...)

View File

@ -0,0 +1,85 @@
diff --git a/include/BoostRoot.cmake b/include/BoostRoot.cmake
index e93f90712..063032e8a 100644
--- a/include/BoostRoot.cmake
+++ b/include/BoostRoot.cmake
@@ -21,7 +21,7 @@ set(__boost_incompatible_libraries "")
# Define cache variables if root project
-if(CMAKE_SOURCE_DIR STREQUAL Boost_SOURCE_DIR)
+if(1)
# --with-<library>
set(BOOST_INCLUDE_LIBRARIES "" CACHE STRING
@@ -188,6 +188,7 @@ endfunction()
function(__boost_scan_dependencies lib var)
set(result "")
+ set(required_components "")
if(EXISTS "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs/${lib}/CMakeLists.txt")
@@ -196,7 +197,8 @@ function(__boost_scan_dependencies lib var)
foreach(line IN LISTS data)
if(line MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
+ list(APPEND required_components ${CMAKE_MATCH_1})
string(REGEX REPLACE "^numeric_" "numeric/" dep ${CMAKE_MATCH_1})
list(APPEND result ${dep})
@@ -206,13 +207,18 @@ function(__boost_scan_dependencies lib var)
endif()
+ list(REMOVE_DUPLICATES required_components)
+ list(REMOVE_ITEM required_components boost ${lib}) # due to property_tree and python
+ if(required_components)
+ find_package(Boost COMPONENTS ${required_components} REQUIRED CONFIG)
+ endif()
set(${var} ${result} PARENT_SCOPE)
endfunction()
#
file(GLOB __boost_libraries RELATIVE "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs" "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs/*/CMakeLists.txt" "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs/numeric/*/CMakeLists.txt")
# Check for mistakes in BOOST_INCLUDE_LIBRARIES
@@ -251,13 +256,13 @@ while(__boost_libs_to_scan)
list(REMOVE_DUPLICATES __boost_dependencies)
- set(__boost_libs_to_scan ${__boost_dependencies})
if(__boost_libs_to_scan)
list(REMOVE_ITEM __boost_libs_to_scan ${__boost_include_libraries})
+ list(REMOVE_ITEM __boost_libs_to_scan ${__boost_lib})
endif()
list(APPEND __boost_include_libraries ${__boost_libs_to_scan})
endwhile()
@@ -362,13 +367,14 @@ if(CMAKE_SKIP_INSTALL_RULES)
endif()
+if(0)
set(CONFIG_INSTALL_DIR "${BOOST_INSTALL_CMAKEDIR}/Boost-${BOOST_SUPERPROJECT_VERSION}")
set(CONFIG_FILE_NAME "${CMAKE_CURRENT_LIST_DIR}/../config/BoostConfig.cmake")
install(FILES "${CONFIG_FILE_NAME}" DESTINATION "${CONFIG_INSTALL_DIR}")
set(CONFIG_VERSION_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/tmpinst/BoostConfigVersion.cmake")
if(NOT CMAKE_VERSION VERSION_LESS 3.14)
write_basic_package_version_file("${CONFIG_VERSION_FILE_NAME}" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)
@@ -385,3 +392,4 @@ else()
endif()
install(FILES "${CONFIG_VERSION_FILE_NAME}" DESTINATION "${CONFIG_INSTALL_DIR}")
+endif()
\ No newline at end of file

View File

@ -0,0 +1,3 @@
include_guard(GLOBAL)
include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-boost/vcpkg-port-config.cmake")

View File

@ -1,21 +1,24 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-modular-build-helper",
"name": "boost-cmake",
"version": "1.84.0",
"port-version": 3,
"description": "Internal vcpkg port used to build Boost libraries",
"license": "MIT",
"description": "Boost cmake files",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-uninstall",
"version>=": "1.84.0"
},
{
"name": "vcpkg-boost",
"host": true
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-get-vars",
"name": "vcpkg-cmake-config",
"host": true
}
]

View File

@ -0,0 +1,16 @@
diff --git a/include/BoostInstall.cmake b/include/BoostInstall.cmake
index 49c0086fea..d5403a19e7 100644
--- a/include/BoostInstall.cmake
+++ b/include/BoostInstall.cmake
@@ -332,9 +332,9 @@ function(boost_install_target)
string(APPEND CONFIG_FILE_CONTENTS "find_dependency(LibLZMA)\n")
- elseif(dep STREQUAL "zstd::libzstd_shared" OR dep STREQUAL "zstd::libzstd_static")
+ elseif(dep MATCHES "zstd::libzstd_(shared|static)")
- string(APPEND CONFIG_FILE_CONTENTS "find_dependency(zstd)\n")
+ string(APPEND CONFIG_FILE_CONTENTS "find_dependency(zstd CONFIG)\n")
elseif(dep STREQUAL "MPI::MPI_C")

View File

@ -1,24 +0,0 @@
list(APPEND B2_OPTIONS cxxstd=20)
set(unsupported_compiler FALSE)
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14")
set(unsupported_compiler TRUE)
endif()
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_VERSION VERSION_LESS "16")
list(APPEND B2_OPTIONS "boost.cobalt.pmr=boost-container")
endif()
elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
set(unsupported_compiler TRUE)
endif()
elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if (VCPKG_DETECTED_MSVC_VERSION LESS "1930")
set(unsupported_compiler TRUE)
endif()
endif()
if(unsupported_compiler)
message(FATAL_ERROR "Boost.Cobalt is supported since Clang 14, GCC 10 and MSVC 19.30 (Visual Studio 2022). Detected compiler is ${VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID} ${VCPKG_DETECTED_MSVC_VERSION}.")
endif()

View File

@ -8,15 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile"
"import ../../config/checks/config"
"import ../config/checks/config"
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(
SOURCE_PATH ${SOURCE_PATH}
BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

View File

@ -2,22 +2,22 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-cobalt",
"version": "1.84.0",
"port-version": 1,
"description": "Boost cobalt module",
"homepage": "https://github.com/boostorg/cobalt",
"license": "BSL-1.0",
"supports": "!osx & !ios & !android",
"supports": "!osx & !ios & !android & !uwp",
"dependencies": [
{
"name": "boost-asio",
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-circular-buffer",
"version>=": "1.84.0"
},
{
"name": "boost-circular-buffer",
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -32,6 +32,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-intrusive",
"version>=": "1.84.0"
@ -40,11 +44,6 @@
"name": "boost-leaf",
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"version>=": "1.84.0"
},
{
"name": "boost-mp11",
"version>=": "1.84.0"
@ -68,14 +67,6 @@
{
"name": "boost-variant2",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-compat",
"version": "1.84.0",
"port-version": 1,
"description": "Boost compat module",
"homepage": "https://github.com/boostorg/compat",
"license": "BSL-1.0",
@ -10,17 +11,21 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,16 +2,21 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-compatibility",
"version": "1.84.0",
"port-version": 1,
"description": "Boost compatibility module",
"homepage": "https://github.com/boostorg/compatibility",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-headers",
"version>=": "1.84.0"
}
]

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9afee7ff90..44f0c20256 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(boost_compute
Boost::chrono
Boost::config
Boost::core
- Boost::filesystem
+ $<TARGET_NAME_IF_EXISTS:Boost::filesystem>
Boost::function
Boost::function_types
Boost::fusion

View File

@ -6,7 +6,12 @@ vcpkg_from_github(
REF boost-${VERSION}
SHA512 6fe8801b1fb8e37b5182f784e1c2938a9039f63770d58310df9a76eb7dcb0d9f1a93e31b4a69346f59273e59c2cff3ae0cf32f9a3c2e95364c70d77615bce731
HEAD_REF master
PATCHES
opt-filesystem.diff
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-compute",
"version": "1.84.0",
"port-version": 1,
"description": "Boost compute module",
"homepage": "https://github.com/boostorg/compute",
"license": "BSL-1.0",
@ -22,6 +23,10 @@
"name": "boost-chrono",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -47,6 +52,10 @@
"name": "boost-fusion",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-iterator",
"version>=": "1.84.0"
@ -114,10 +123,6 @@
{
"name": "boost-uuid",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,14 +2,23 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-concept-check",
"version": "1.84.0",
"port-version": 1,
"description": "Boost concept_check module",
"homepage": "https://github.com/boostorg/concept_check",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-preprocessor",
"version>=": "1.84.0"
@ -21,10 +30,6 @@
{
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,12 +8,15 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n")
file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#undef BOOST_ALL_DYN_LINK\n")
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)
file(APPEND "${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp" "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n")
file(APPEND "${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp" "\n#undef BOOST_ALL_DYN_LINK\n")
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_DYN_LINK\n")
file(APPEND "${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp" "\n#define BOOST_ALL_DYN_LINK\n")
endif()
file(COPY ${SOURCE_PATH}/checks DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-config)
file(COPY "${SOURCE_PATH}/libs/config/checks" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-config")

View File

@ -2,12 +2,17 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-config",
"version": "1.84.0",
"port-version": 1,
"description": "Boost config module",
"homepage": "https://github.com/boostorg/config",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-vcpkg-helpers",
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
}
]

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,10 +2,15 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-container-hash",
"version": "1.84.0",
"port-version": 1,
"description": "Boost container_hash module",
"homepage": "https://github.com/boostorg/container_hash",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -15,11 +20,11 @@
"version>=": "1.84.0"
},
{
"name": "boost-mp11",
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-mp11",
"version>=": "1.84.0"
}
]

View File

@ -8,7 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-container",
"version": "1.84.0",
"port-version": 1,
"description": "Boost container module",
"homepage": "https://github.com/boostorg/container",
"license": "BSL-1.0",
@ -11,8 +12,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -20,12 +20,11 @@
"version>=": "1.84.0"
},
{
"name": "boost-intrusive",
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-intrusive",
"version>=": "1.84.0"
},
{
@ -35,14 +34,6 @@
{
"name": "boost-static-assert",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -1,35 +0,0 @@
if(@VCPKG_TARGET_IS_WINDOWS@)
list(APPEND B2_OPTIONS
abi=ms
binary-format=pe
)
endif()
if(@VCPKG_TARGET_IS_OSX@)
if(@VCPKG_TARGET_ARCHITECTURE@ MATCHES "^(ARM|arm)64$")
list(APPEND B2_OPTIONS
abi=aapcs
binary-format=mach-o
)
else()
list(APPEND B2_OPTIONS
abi=sysv
binary-format=mach-o
)
endif()
endif()
if("@VCPKG_TARGET_IS_LINUX@" STREQUAL "ON" OR "@VCPKG_TARGET_IS_ANDROID@" STREQUAL "ON")
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
list(APPEND B2_OPTIONS
abi=aapcs
)
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
list(APPEND B2_OPTIONS
abi=sysv
)
endif()
list(APPEND B2_OPTIONS
binary-format=elf
)
endif()

View File

@ -0,0 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca534962d..bf02ea3425 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,7 +142,11 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
enable_language(ASM)
endif()
elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
+ if(MSVC)
+ enable_language(ASM_MARMASM)
+ else()
enable_language(ASM_ARMASM)
+ endif()
else()
enable_language(ASM_MASM)
endif()

View File

@ -6,22 +6,13 @@ vcpkg_from_github(
REF boost-${VERSION}
SHA512 dfee5b07fbf7cf1c41a55c5bd95d1f52edefb821c3f3d37bc8ffe6ee0c9605660d524f340dcd2568b3d7ac932d252a26a45e76a82efa02daa0ce27bd3c03ea46
HEAD_REF master
PATCHES
marmasm.patch
)
vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
"import ../../config/checks/config"
"import ../config/checks/config"
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
configure_file(
"${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"
"${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
@ONLY
)
boost_modular_build(
SOURCE_PATH ${SOURCE_PATH}
BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-context",
"version": "1.84.0",
"port-version": 1,
"description": "Boost context module",
"homepage": "https://github.com/boostorg/context",
"license": "BSL-1.0",
@ -12,8 +13,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -25,8 +25,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-headers",
"version>=": "1.84.0"
},
{
@ -44,14 +43,6 @@
{
"name": "boost-smart-ptr",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,7 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-contract",
"version": "1.84.0",
"port-version": 1,
"description": "Boost contract module",
"homepage": "https://github.com/boostorg/contract",
"license": "BSL-1.0",
@ -15,8 +16,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -40,8 +40,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-headers",
"version>=": "1.84.0"
},
{
@ -79,14 +78,6 @@
{
"name": "boost-utility",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-conversion",
"version": "1.84.0",
"port-version": 1,
"description": "Boost conversion module",
"homepage": "https://github.com/boostorg/conversion",
"license": "BSL-1.0",
@ -10,10 +11,18 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-smart-ptr",
"version>=": "1.84.0"
@ -21,10 +30,6 @@
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,10 +2,15 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-convert",
"version": "1.84.0",
"port-version": 1,
"description": "Boost convert module",
"homepage": "https://github.com/boostorg/convert",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -18,6 +23,10 @@
"name": "boost-function-types",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-lexical-cast",
"version>=": "1.84.0"
@ -49,10 +58,6 @@
{
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-core",
"version": "1.84.0",
"port-version": 1,
"description": "Boost core module",
"homepage": "https://github.com/boostorg/core",
"license": "BSL-1.0",
@ -10,10 +11,18 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-static-assert",
"version>=": "1.84.0"
@ -21,10 +30,6 @@
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,7 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-coroutine",
"version": "1.84.0",
"port-version": 1,
"description": "Boost coroutine module",
"homepage": "https://github.com/boostorg/coroutine",
"license": "BSL-1.0",
@ -12,8 +13,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -34,8 +34,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-headers",
"version>=": "1.84.0"
},
{
@ -57,14 +56,6 @@
{
"name": "boost-utility",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,26 +2,29 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-coroutine2",
"version": "1.84.0",
"port-version": 1,
"description": "Boost coroutine2 module",
"homepage": "https://github.com/boostorg/coroutine2",
"license": "BSL-1.0",
"supports": "!emscripten",
"dependencies": [
{
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-context",
"platform": "!uwp & !emscripten",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-headers",
"version>=": "1.84.0"
}
]

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-crc",
"version": "1.84.0",
"port-version": 1,
"description": "Boost crc module",
"homepage": "https://github.com/boostorg/crc",
"license": "BSL-1.0",
@ -10,10 +11,18 @@
"name": "boost-array",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-integer",
"version>=": "1.84.0"
@ -21,10 +30,6 @@
{
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,7 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-date-time",
"version": "1.84.0",
"port-version": 1,
"description": "Boost date_time module",
"homepage": "https://github.com/boostorg/date_time",
"license": "BSL-1.0",
@ -15,8 +16,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -27,6 +27,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-io",
"version>=": "1.84.0"
@ -35,11 +39,6 @@
"name": "boost-lexical-cast",
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"version>=": "1.84.0"
},
{
"name": "boost-numeric-conversion",
"version>=": "1.84.0"
@ -72,17 +71,9 @@
"name": "boost-utility",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "boost-winapi",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,21 +2,26 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-describe",
"version": "1.84.0",
"port-version": 1,
"description": "Boost describe module",
"homepage": "https://github.com/boostorg/describe",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-mp11",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,10 +2,15 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-detail",
"version": "1.84.0",
"port-version": 1,
"description": "Boost detail module",
"homepage": "https://github.com/boostorg/detail",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -14,6 +19,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-preprocessor",
"version>=": "1.84.0"
@ -25,10 +34,6 @@
{
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-dll",
"version": "1.84.0",
"port-version": 1,
"description": "Boost dll module",
"homepage": "https://github.com/boostorg/dll",
"license": "BSL-1.0",
@ -10,6 +11,10 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -20,13 +25,16 @@
},
{
"name": "boost-filesystem",
"platform": "!uwp",
"version>=": "1.84.0"
},
{
"name": "boost-function",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-move",
"version>=": "1.84.0"
@ -59,10 +67,6 @@
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "boost-winapi",
"version>=": "1.84.0"

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-dynamic-bitset",
"version": "1.84.0",
"port-version": 1,
"description": "Boost dynamic_bitset module",
"homepage": "https://github.com/boostorg/dynamic_bitset",
"license": "BSL-1.0",
@ -10,6 +11,10 @@
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
@ -22,6 +27,10 @@
"name": "boost-core",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-integer",
"version>=": "1.84.0"
@ -37,10 +46,6 @@
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,16 +2,21 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-endian",
"version": "1.84.0",
"port-version": 1,
"description": "Boost endian module",
"homepage": "https://github.com/boostorg/endian",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"name": "boost-headers",
"version>=": "1.84.0"
}
]

View File

@ -8,7 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-exception",
"version": "1.84.0",
"port-version": 1,
"description": "Boost exception module",
"homepage": "https://github.com/boostorg/exception",
"license": "BSL-1.0",
@ -11,8 +12,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -24,8 +24,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-headers",
"version>=": "1.84.0"
},
{
@ -43,14 +42,6 @@
{
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,15 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
"import ../../config/checks/config"
"import ../config/checks/config"
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(
SOURCE_PATH ${SOURCE_PATH}
BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-fiber",
"version": "1.84.0",
"port-version": 1,
"description": "Boost fiber module",
"homepage": "https://github.com/boostorg/fiber",
"license": "BSL-1.0",
@ -16,8 +17,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -43,12 +43,11 @@
"version>=": "1.84.0"
},
{
"name": "boost-intrusive",
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"name": "boost-intrusive",
"version>=": "1.84.0"
},
{
@ -58,14 +57,6 @@
{
"name": "boost-smart-ptr",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {

View File

@ -8,7 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

View File

@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-filesystem",
"version": "1.84.0",
"port-version": 1,
"description": "Boost filesystem module",
"homepage": "https://github.com/boostorg/filesystem",
"license": "BSL-1.0",
@ -16,8 +17,7 @@
"version>=": "1.84.0"
},
{
"name": "boost-build",
"host": true,
"name": "boost-cmake",
"version>=": "1.84.0"
},
{
@ -36,6 +36,10 @@
"name": "boost-detail",
"version>=": "1.84.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
},
{
"name": "boost-io",
"version>=": "1.84.0"
@ -44,11 +48,6 @@
"name": "boost-iterator",
"version>=": "1.84.0"
},
{
"name": "boost-modular-build-helper",
"host": true,
"version>=": "1.84.0"
},
{
"name": "boost-predef",
"version>=": "1.84.0"
@ -69,17 +68,9 @@
"name": "boost-type-traits",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
},
{
"name": "boost-winapi",
"version>=": "1.84.0"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -8,5 +8,8 @@ vcpkg_from_github(
HEAD_REF master
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)

Some files were not shown because too many files have changed in this diff Show More