diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index 7b64907146..69e90e246d 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -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} +) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index dca7115713..f9b8efd480 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 00a423141e..5eaba214ee 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -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} +) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index 983aaa0fd9..2d0a8c6b90 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index f328c03bd7..1bf5ffee11 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -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} +) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index c0594abc93..d0405223ec 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -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" } ] diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 60ddbd2745..8928f207b2 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -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} +) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index bc52cf0bd1..6235964224 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 99e3270991..c112a77be2 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -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} +) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index bc52c1fabd..3ea2a6ba23 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-asio/opt-dep.diff b/ports/boost-asio/opt-dep.diff new file mode 100644 index 0000000000..49992e76f5 --- /dev/null +++ b/ports/boost-asio/opt-dep.diff @@ -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 ++ $ ++ $ + Boost::date_time + Boost::system + Boost::throw_exception + ) + ++if(NOT TARGET Boost::context) ++ target_compile_definitions(boost_asio INTERFACE $<$>:BOOST_ASIO_DISABLE_BOOST_CONTEXT_FIBER>) ++endif() ++ ++if(NOT TARGET Boost::coroutine) ++ target_compile_definitions(boost_asio INTERFACE $<$>: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") diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index c6bc0aa5b0..9115b71792 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -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} +) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index aec544c4e9..37a9be2c59 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -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": { diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 61178b2da1..6b0baaf9a3 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -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} +) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index 15f9b3bc13..3477a3982e 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -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" } ] diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 55d0ce710c..e7cd7d52c8 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -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} +) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index 506a54c980..46b250256c 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-atomic/fix-include.patch b/ports/boost-atomic/fix-include.patch new file mode 100644 index 0000000000..f78794baad --- /dev/null +++ b/ports/boost-atomic/fix-include.patch @@ -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}) diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 4ada017002..00be174e39 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -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} +) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 4d0dbc0112..d2d524bcd9 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 6f6de86da0..092ca10e93 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -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} +) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index f02185e2c7..02e4a131ac 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -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" diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 4ef814d296..7ab06e2653 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -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} +) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index be1e5fbeff..6929ee0786 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 9e7e8927fe..067b21ad61 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -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} +) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index 460c0858cd..e941821fb0 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -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" } ] diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index e4baa46816..368a38385b 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -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", diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index e3b4bc1d04..6bc81fcc4d 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -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} +) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index 02863e6b6d..a15fecec57 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -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" } ] diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 16b13d114b..589d43de86 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -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} +) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index 68aafcabe5..00fc5d6c34 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 4291f35703..74dcc45e94 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -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} +) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index bf6251b746..2c68516bfd 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-cmake/CMakeLists.txt.in b/ports/boost-cmake/CMakeLists.txt.in new file mode 100644 index 0000000000..5659fadc0e --- /dev/null +++ b/ports/boost-cmake/CMakeLists.txt.in @@ -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") \ No newline at end of file diff --git a/ports/boost-cmake/add-optional-deps.diff b/ports/boost-cmake/add-optional-deps.diff new file mode 100644 index 0000000000..996545fb6e --- /dev/null +++ b/ports/boost-cmake/add-optional-deps.diff @@ -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 "^\\$$") ++ ++ 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 "^[ ]*$[ ]*$") ++ ++ 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) + diff --git a/ports/boost-cmake/fix-missing-archs.diff b/ports/boost-cmake/fix-missing-archs.diff new file mode 100644 index 0000000000..298e1335b6 --- /dev/null +++ b/ports/boost-cmake/fix-missing-archs.diff @@ -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() diff --git a/ports/boost-cmake/fix-mpi.diff b/ports/boost-cmake/fix-mpi.diff new file mode 100644 index 0000000000..64158a612b --- /dev/null +++ b/ports/boost-cmake/fix-mpi.diff @@ -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 diff --git a/ports/boost-cmake/no-prefix.diff b/ports/boost-cmake/no-prefix.diff new file mode 100644 index 0000000000..1c0f77e934 --- /dev/null +++ b/ports/boost-cmake/no-prefix.diff @@ -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 diff --git a/ports/boost-cmake/portfile.cmake b/ports/boost-cmake/portfile.cmake new file mode 100644 index 0000000000..17b71dcb07 --- /dev/null +++ b/ports/boost-cmake/portfile.cmake @@ -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") diff --git a/ports/boost-cmake/ref_sha.cmake b/ports/boost-cmake/ref_sha.cmake new file mode 100644 index 0000000000..b5be3e72c3 --- /dev/null +++ b/ports/boost-cmake/ref_sha.cmake @@ -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) diff --git a/ports/boost-modular-build-helper/usage b/ports/boost-cmake/usage similarity index 62% rename from ports/boost-modular-build-helper/usage rename to ports/boost-cmake/usage index 89a0376dad..d246f42a4b 100644 --- a/ports/boost-modular-build-helper/usage +++ b/ports/boost-cmake/usage @@ -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 ...]) target_link_libraries(main PRIVATE Boost::boost Boost:: Boost:: ...) diff --git a/ports/boost-cmake/vcpkg-build.diff b/ports/boost-cmake/vcpkg-build.diff new file mode 100644 index 0000000000..773543f57f --- /dev/null +++ b/ports/boost-cmake/vcpkg-build.diff @@ -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- + 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 diff --git a/ports/boost-cmake/vcpkg-port-config.cmake b/ports/boost-cmake/vcpkg-port-config.cmake new file mode 100644 index 0000000000..2f67672d2f --- /dev/null +++ b/ports/boost-cmake/vcpkg-port-config.cmake @@ -0,0 +1,3 @@ +include_guard(GLOBAL) + +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-boost/vcpkg-port-config.cmake") diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-cmake/vcpkg.json similarity index 60% rename from ports/boost-modular-build-helper/vcpkg.json rename to ports/boost-cmake/vcpkg.json index e6a0b676a3..67c37fd1bb 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-cmake/vcpkg.json @@ -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 } ] diff --git a/ports/boost-cmake/zstd.diff b/ports/boost-cmake/zstd.diff new file mode 100644 index 0000000000..7e68e26d66 --- /dev/null +++ b/ports/boost-cmake/zstd.diff @@ -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") + diff --git a/ports/boost-cobalt/b2-options.cmake b/ports/boost-cobalt/b2-options.cmake deleted file mode 100644 index aa8ba1c337..0000000000 --- a/ports/boost-cobalt/b2-options.cmake +++ /dev/null @@ -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() diff --git a/ports/boost-cobalt/portfile.cmake b/ports/boost-cobalt/portfile.cmake index 08b66764c5..ae9f1c1371 100644 --- a/ports/boost-cobalt/portfile.cmake +++ b/ports/boost-cobalt/portfile.cmake @@ -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}) diff --git a/ports/boost-cobalt/vcpkg.json b/ports/boost-cobalt/vcpkg.json index 760e90fa5e..3c91a032ec 100644 --- a/ports/boost-cobalt/vcpkg.json +++ b/ports/boost-cobalt/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-compat/portfile.cmake b/ports/boost-compat/portfile.cmake index f094c06aac..1052d8d292 100644 --- a/ports/boost-compat/portfile.cmake +++ b/ports/boost-compat/portfile.cmake @@ -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} +) diff --git a/ports/boost-compat/vcpkg.json b/ports/boost-compat/vcpkg.json index 6213189c20..ffd4bd8d24 100644 --- a/ports/boost-compat/vcpkg.json +++ b/ports/boost-compat/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index e8688abc31..bae0596a8f 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -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} +) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index c1999f908e..2eb65c5eeb 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -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" } ] diff --git a/ports/boost-compute/opt-filesystem.diff b/ports/boost-compute/opt-filesystem.diff new file mode 100644 index 0000000000..2485b39273 --- /dev/null +++ b/ports/boost-compute/opt-filesystem.diff @@ -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 ++ $ + Boost::function + Boost::function_types + Boost::fusion diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index b98abf2ab8..866c73fe7f 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -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} +) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index 9dcb366f95..f21c982bfc 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index feca3bcbb9..810d0d6d71 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -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} +) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index 7855af3a18..5d83109d37 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index bf5151b3c0..1535280fcc 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -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") diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index b2e9fbe971..0a49dd5bec 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -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" } ] diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index 430d06e455..d123b79cdc 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -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} +) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index f2d4ec4a3c..70ecd293f1 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -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" } ] diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 88e34eb147..d84ad479b0 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -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} +) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index df10230d88..60d736498c 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-context/b2-options.cmake.in b/ports/boost-context/b2-options.cmake.in deleted file mode 100644 index 80166c0992..0000000000 --- a/ports/boost-context/b2-options.cmake.in +++ /dev/null @@ -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() diff --git a/ports/boost-context/marmasm.patch b/ports/boost-context/marmasm.patch new file mode 100644 index 0000000000..6576b76f1a --- /dev/null +++ b/ports/boost-context/marmasm.patch @@ -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() diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index d5d469f35f..22dcfdee10 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -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}) diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 4550588d3d..e5cb706f76 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 7e2829817c..acafe93763 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -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} +) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 2bbc92487b..3f52cd2376 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index 4c72f045e2..e81938e323 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -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} +) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index 952c04919d..d7ecd92106 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 5b15266a9f..f06a9e93cc 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -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} +) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index 6d7183cae7..43dcf48d12 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 7571b7743d..5de24f2673 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -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} +) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index f424b0e3fd..320cc297d0 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 7a12090ea8..53974980e4 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -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} +) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 4a2b61c125..6bb534f3c3 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index e7e7560d95..5e5204ada7 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -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} +) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index bfc9bf68e1..3348ab6400 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -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" } ] diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index b7f522cc16..e9460241e5 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -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} +) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index c47b27a7b3..2a10084746 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index ff00f81a9b..3ff6528567 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -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} +) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index 3b25fa21c6..5ca054728a 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-describe/portfile.cmake b/ports/boost-describe/portfile.cmake index 67452721c4..f98f2f3a3c 100644 --- a/ports/boost-describe/portfile.cmake +++ b/ports/boost-describe/portfile.cmake @@ -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} +) diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json index c1845143df..9f53f89b9d 100644 --- a/ports/boost-describe/vcpkg.json +++ b/ports/boost-describe/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index f6f6f5e395..ab123212ff 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -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} +) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index 1021eda04d..2c7365b40f 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 176d2eb14e..c1f3e6abbd 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -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} +) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index 0c82a3657c..e1c68471e7 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -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" diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index d9625a947c..5440a7daa8 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -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} +) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index 2de8c51226..7086c99712 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -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" } ] } diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index c0cb0d5234..2da24c7d7e 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -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} +) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index 21829a3284..bf875bfeca 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -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" } ] diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index 7156e3d890..6d14266ea5 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -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} +) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index 542fb276a5..ef6d3fd156 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index 2b4ada00ec..19df36d7f2 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -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}) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index d84907ec9d..8bf938dc70 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -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": { diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index eca6896d20..0228defd5a 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -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} +) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index d24b81a308..b8a576a4df 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -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 } ] } diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 65f26532b0..887dee2121 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -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} +) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index 69dbcbe49d..37f2f5036e 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-flyweight", "version": "1.84.0", + "port-version": 1, "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "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" @@ -26,6 +31,10 @@ "name": "boost-detail", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-interprocess", "version>=": "1.84.0" @@ -57,10 +66,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 3af52ee559..a3b2290c6e 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -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} +) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index e494da7617..41167583cd 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-foreach", "version": "1.84.0", + "port-version": 1, "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "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-iterator", "version>=": "1.84.0" @@ -29,10 +38,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 9d6f5d068b..34d7df4ed9 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -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} +) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index f5b2c3a556..f441147a31 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-format", "version": "1.84.0", + "port-version": 1, "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "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-optional", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index d795c3b965..27410782e6 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -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} +) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 12e925817d..b0600ec724 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function-types", "version": "1.84.0", + "port-version": 1, "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "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-detail", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -29,10 +38,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index 36b52202d2..6dcdad0424 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -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} +) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index 841206d59c..6567bcba49 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function", "version": "1.84.0", + "port-version": 1, "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-bind", "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-preprocessor", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 5690b2486f..d8859c3703 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -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} +) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index 6cf479120d..d6b5f1d421 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-functional", "version": "1.84.0", + "port-version": 1, "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "license": "BSL-1.0", "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -22,6 +27,10 @@ "name": "boost-function-types", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -41,10 +50,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 7ba4551a37..dd4b8184ea 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -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} +) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index d67d4401c0..44ac330cfd 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-fusion", "version": "1.84.0", + "port-version": 1, "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "license": "BSL-1.0", "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -26,6 +31,10 @@ "name": "boost-functional", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -53,10 +62,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 62d947cbd9..a4af2eff99 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -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} +) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index 23e969b9a8..93540850d6 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-geometry", "version": "1.84.0", + "port-version": 1, "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "license": "BSL-1.0", @@ -22,6 +23,10 @@ "name": "boost-assert", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-concept-check", "version>=": "1.84.0" @@ -46,6 +51,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -125,10 +134,6 @@ { "name": "boost-variant2", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index c94bf3f846..25d2df390b 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -6,7 +6,12 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 0fa13a3c02b29dfaa6cf16df5e9efedc50bba8f762694c337d6ab9ee00564d2ba7a4326d32c150a187f435c8ddd41895b46311a49b7c9c4e117d47665dcbbd8b HEAD_REF master + PATCHES + remove-boost-filesystem-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} +) diff --git a/ports/boost-gil/remove-boost-filesystem-dep.diff b/ports/boost-gil/remove-boost-filesystem-dep.diff new file mode 100644 index 0000000000..6fc07b798c --- /dev/null +++ b/ports/boost-gil/remove-boost-filesystem-dep.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd94577e89..4e14499dab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,7 +27,6 @@ target_link_libraries(boost_gil + Boost::config + Boost::container_hash + Boost::core +- Boost::filesystem + Boost::integer + Boost::iterator + Boost::mp11 diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 0663400a3c..d8ba43a494 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-gil", "version": "1.84.0", + "port-version": 1, "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "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" @@ -26,6 +31,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -49,10 +58,6 @@ { "name": "boost-variant2", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 4dd212b9ea..d50cc75be9 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -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} +) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index f7f679e033..edf3a21bec 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph-parallel", "version": "1.84.0", + "port-version": 1, "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "license": "BSL-1.0", @@ -16,8 +17,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -61,6 +61,10 @@ "name": "boost-graph", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -69,11 +73,6 @@ "name": "boost-lexical-cast", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-mpi", "platform": "!uwp", @@ -124,14 +123,6 @@ "name": "boost-variant", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - "mpi", - { - "name": "vcpkg-cmake", - "host": true - } + "mpi" ] } diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index bf6226af66..ae3a256e7a 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -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} +) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index f2ed6f8800..7f7cf335fb 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph", "version": "1.84.0", + "port-version": 1, "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "license": "BSL-1.0", @@ -31,8 +32,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -67,6 +67,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -83,11 +87,6 @@ "name": "boost-math", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-move", "version>=": "1.84.0" @@ -122,7 +121,6 @@ }, { "name": "boost-random", - "platform": "!uwp", "version>=": "1.84.0" }, { @@ -177,17 +175,9 @@ "name": "boost-utility", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-xpressive", "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 4db0569823..4e4bdd5029 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -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} +) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index accef8939d..8efbaba735 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hana", "version": "1.84.0", + "port-version": 1, "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "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-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -25,10 +34,6 @@ { "name": "boost-tuple", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-headers/portfile.cmake b/ports/boost-headers/portfile.cmake new file mode 100644 index 0000000000..0849f3d592 --- /dev/null +++ b/ports/boost-headers/portfile.cmake @@ -0,0 +1,15 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/headers + REF boost-${VERSION} + SHA512 25df8bd5e925bbcb6254f21b34ca3e4786178ca1af900f0c5c781f16127539688143ee79f200c132772eb5bb2a519f1f8feafc91ca222d48511fb4eaa135f6f0 + HEAD_REF master +) + +set(FEATURE_OPTIONS "") +boost_configure_and_install( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) diff --git a/ports/boost-headers/vcpkg.json b/ports/boost-headers/vcpkg.json new file mode 100644 index 0000000000..dce581ff31 --- /dev/null +++ b/ports/boost-headers/vcpkg.json @@ -0,0 +1,14 @@ +{ + "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", + "name": "boost-headers", + "version": "1.84.0", + "description": "Boost headers module", + "homepage": "https://github.com/boostorg/headers", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + } + ] +} diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index a1c97fd8c9..20b062c22b 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -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} +) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index 6af4d61f5a..e63ef8b17f 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-heap", "version": "1.84.0", + "port-version": 1, "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "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" @@ -30,6 +35,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-intrusive", "version>=": "1.84.0" @@ -53,10 +62,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 0d30792913..3fbe5fda4d 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -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} +) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index f85d1e8754..71867e3eab 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-histogram", "version": "1.84.0", + "port-version": 1, "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "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-math", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-variant2", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index fb4b55fc54..65c50cb9f6 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -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} +) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 4b6cba4b20..b0c0bd52e6 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hof", "version": "1.84.0", + "port-version": 1, "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "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" } ] diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 352273216c..3a2dbbe8a7 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -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} +) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 2fbffc3ccc..a766b5bdfc 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-icl", "version": "1.84.0", + "port-version": 1, "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "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" @@ -34,6 +39,10 @@ "name": "boost-detail", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -65,10 +74,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index f838a7c873..224491aa6a 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -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} +) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index 1b72bb4608..e465f55733 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-integer", "version": "1.84.0", + "port-version": 1, "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "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" @@ -29,10 +38,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index c22279e24e..bb368f5a18 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -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} +) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index 3c0eac3cf9..adca9e1cc0 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interprocess", "version": "1.84.0", + "port-version": 1, "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "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-intrusive", "version>=": "1.84.0" @@ -42,10 +51,6 @@ "name": "boost-unordered", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-winapi", "version>=": "1.84.0" diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 59293879a8..4eddae51c3 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -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} +) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 44cbd02933..a1ded6ae66 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interval", "version": "1.84.0", + "port-version": 1, "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "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-logic", + "name": "boost-headers", "version>=": "1.84.0" }, { - "name": "boost-vcpkg-helpers", + "name": "boost-logic", "version>=": "1.84.0" } ] diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 22a43ca2f0..7700c5f001 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -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} +) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index 7d11acd0e1..3974742f3c 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-intrusive", "version": "1.84.0", + "port-version": 1, "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "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-container-hash", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-move", "version>=": "1.84.0" @@ -25,10 +34,6 @@ { "name": "boost-static-assert", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index 6063b1f392..2aa4fe6168 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -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} +) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index f750d44657..723f44a478 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-io", "version": "1.84.0", + "port-version": 1, "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "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" } ] diff --git a/ports/boost-iostreams/b2-options.cmake b/ports/boost-iostreams/b2-options.cmake deleted file mode 100644 index 5b24d9d6dd..0000000000 --- a/ports/boost-iostreams/b2-options.cmake +++ /dev/null @@ -1,74 +0,0 @@ -if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(lib_path_suffix lib) -else() - set(lib_path_suffix debug/lib) -endif() - -if("bzip2" IN_LIST FEATURES) - list(APPEND B2_OPTIONS - -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND B2_OPTIONS - -sBZIP2_NAME=bz2d - ) - endif() - list(APPEND B2_OPTIONS - -sBZIP2_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" - ) -else() - list(APPEND B2_OPTIONS - -sNO_BZIP2=1 - ) -endif() - -if("lzma" IN_LIST FEATURES) - list(APPEND B2_OPTIONS - -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - ) - list(APPEND B2_OPTIONS - -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" - ) -else() - list(APPEND B2_OPTIONS - -sNO_LZMA=1 - ) -endif() - -if("zlib" IN_LIST FEATURES) - list(APPEND B2_OPTIONS - -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - ) - # Overwride windows library names - if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(ZLIB_NAME zlibd) - else() - set(ZLIB_NAME zlib) # for mingw - endif() - list(APPEND B2_OPTIONS - -sZLIB_NAME=${ZLIB_NAME} - ) - endif() - list(APPEND B2_OPTIONS - -sZLIB_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" - ) -else() - list(APPEND B2_OPTIONS - -sNO_ZLIB=1 - ) -endif() - -if("zstd" IN_LIST FEATURES) - list(APPEND B2_OPTIONS - -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - ) - list(APPEND B2_OPTIONS - -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" - ) -else() - list(APPEND B2_OPTIONS - -sNO_ZSTD=1 - ) -endif() \ No newline at end of file diff --git a/ports/boost-iostreams/features.cmake b/ports/boost-iostreams/features.cmake new file mode 100644 index 0000000000..d0e5cc1b54 --- /dev/null +++ b/ports/boost-iostreams/features.cmake @@ -0,0 +1,9 @@ +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + "bzip2" BOOST_IOSTREAMS_ENABLE_BZIP2 + "lzma" BOOST_IOSTREAMS_ENABLE_LZMA + "zlib" BOOST_IOSTREAMS_ENABLE_ZLIB + "zstd" BOOST_IOSTREAMS_ENABLE_ZSTD +) \ No newline at end of file diff --git a/ports/boost-iostreams/fix-zstd.diff b/ports/boost-iostreams/fix-zstd.diff new file mode 100644 index 0000000000..776cc3ee1b --- /dev/null +++ b/ports/boost-iostreams/fix-zstd.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1d8352f5f..f603de959 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,7 @@ endfunction() + boost_iostreams_option(BOOST_IOSTREAMS_ENABLE_ZLIB "Boost.Iostreams: Enable ZLIB support" ZLIB "" ZLIB_FOUND ZLIB::ZLIB src/zlib.cpp src/gzip.cpp) + boost_iostreams_option(BOOST_IOSTREAMS_ENABLE_BZIP2 "Boost.Iostreams: Enable BZip2 support" BZip2 "" BZIP2_FOUND BZip2::BZip2 src/bzip2.cpp) + boost_iostreams_option(BOOST_IOSTREAMS_ENABLE_LZMA "Boost.Iostreams: Enable LZMA support" LibLZMA "" LIBLZMA_FOUND LibLZMA::LibLZMA src/lzma.cpp) +-boost_iostreams_option(BOOST_IOSTREAMS_ENABLE_ZSTD "Boost.Iostreams: Enable Zstd support" zstd "1.0" zstd_FOUND zstd::libzstd_shared src/zstd.cpp) ++boost_iostreams_option(BOOST_IOSTREAMS_ENABLE_ZSTD "Boost.Iostreams: Enable Zstd support" zstd "1.0" zstd_FOUND $,zstd::libzstd_shared,zstd::libzstd_static> src/zstd.cpp) + + include(CheckCXXSourceCompiles) + diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 438df7f72f..362d49f095 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -6,13 +6,14 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 2cd4aaf6c02f7ede5a2066072ec968a08035a44d45cb603665b898d2ad88f015e9c12022f56474a3277e9440d3dfce302587f8ac87d7fb72f574eed570089aab HEAD_REF master - PATCHES Removeseekpos.patch + PATCHES + Removeseekpos.patch + fix-zstd.diff ) -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" +set(FEATURE_OPTIONS "") +include("${CMAKE_CURRENT_LIST_DIR}/features.cmake") +boost_configure_and_install( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index c52c6b0ac8..0884599af1 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iostreams", "version": "1.84.0", + "port-version": 1, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", @@ -12,8 +13,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -32,6 +32,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -40,11 +44,6 @@ "name": "boost-iterator", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -89,14 +88,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ], "default-features": [ diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index 658c1fdb6d..2e70e65da4 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -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} +) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index 7df42523ed..a970284651 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iterator", "version": "1.84.0", + "port-version": 1, "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "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" @@ -34,6 +39,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -57,10 +66,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 48cc32bf15..cb14475ca8 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -8,12 +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}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 6f01170bb7..e23b728595 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-json", "version": "1.84.0", + "port-version": 1, "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "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" }, { @@ -55,14 +54,6 @@ { "name": "boost-throw-exception", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index 623b2efe36..6cff009384 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -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} +) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index d18725fd06..ef868f4771 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda", "version": "1.84.0", + "port-version": 1, "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "license": "BSL-1.0", @@ -10,6 +11,10 @@ "name": "boost-bind", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -22,6 +27,10 @@ "name": "boost-detail", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -45,10 +54,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-lambda2/portfile.cmake b/ports/boost-lambda2/portfile.cmake index c7ef478609..566a6984bc 100644 --- a/ports/boost-lambda2/portfile.cmake +++ b/ports/boost-lambda2/portfile.cmake @@ -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} +) diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json index c23397b0ae..9ef4e71426 100644 --- a/ports/boost-lambda2/vcpkg.json +++ b/ports/boost-lambda2/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda2", "version": "1.84.0", + "port-version": 1, "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", "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" } ] diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index 554c935395..988209ca74 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -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} +) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index 64f6d717a6..8f3b203f4c 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-leaf", "version": "1.84.0", + "port-version": 1, "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "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" } ] diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 24d950d20a..98e913cd3d 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -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} +) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index a13d5e0f22..f09f1d2f5b 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lexical-cast", "version": "1.84.0", + "port-version": 1, "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "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-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index c26530e288..3c884bdbc8 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -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} +) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index a700c72634..7d78c5e438 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -2,14 +2,23 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-local-function", "version": "1.84.0", + "port-version": 1, "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "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-mpl", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-locale/b2-options.cmake.in b/ports/boost-locale/b2-options.cmake.in deleted file mode 100644 index 66fa64326f..0000000000 --- a/ports/boost-locale/b2-options.cmake.in +++ /dev/null @@ -1,42 +0,0 @@ -set(_B2_OPTIONS_FEATURES "@FEATURES@") -if("icu" IN_LIST _B2_OPTIONS_FEATURES) - set(BOOST_LOCALE_ENABLE_ICU on) -else() - set(BOOST_LOCALE_ENABLE_ICU off) -endif() - -if(@VCPKG_TARGET_IS_WINDOWS@) - set(BOOST_LOCALE_ENABLE_ICONV off) - set(BOOST_LOCALE_ENABLE_POSIX off) - set(BOOST_LOCALE_ENABLE_WINAPI on) -else() - find_library(VCPKG_ICONV_LIBRARY_RELEASE iconv PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) - find_library(VCPKG_ICONV_LIBRARY_DEBUG iconv PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) - set(BOOST_LOCALE_ENABLE_ICONV on) - if(@VCPKG_TARGET_IS_ANDROID@) - set(BOOST_LOCALE_ENABLE_POSIX off) - else() - set(BOOST_LOCALE_ENABLE_POSIX on) - endif() - set(BOOST_LOCALE_ENABLE_WINAPI off) -endif() - -list(APPEND B2_OPTIONS - boost.locale.iconv=${BOOST_LOCALE_ENABLE_ICONV} - boost.locale.icu=${BOOST_LOCALE_ENABLE_ICU} - boost.locale.posix=${BOOST_LOCALE_ENABLE_POSIX} - boost.locale.winapi=${BOOST_LOCALE_ENABLE_WINAPI} - /boost/locale//boost_locale -) - -if(BOOST_LOCALE_ENABLE_ICONV) - list(APPEND B2_OPTIONS - -sICONV_PATH=${CURRENT_INSTALLED_DIR} - ) - - if(VCPKG_TARGET_IS_OSX OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") - list(APPEND B2_OPTIONS - boost.locale.force-found-iconv=on - ) - endif() -endif() diff --git a/ports/boost-locale/features.cmake b/ports/boost-locale/features.cmake new file mode 100644 index 0000000000..e9017331a1 --- /dev/null +++ b/ports/boost-locale/features.cmake @@ -0,0 +1,44 @@ +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + "icu" BOOST_LOCALE_ENABLE_ICU +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(BOOST_LOCALE_ENABLE_ICONV off) + set(BOOST_LOCALE_ENABLE_POSIX off) +else() + set(BOOST_LOCALE_ENABLE_ICONV on) + if(VCPKG_TARGET_IS_ANDROID) + set(BOOST_LOCALE_ENABLE_POSIX off) + else() + set(BOOST_LOCALE_ENABLE_POSIX on) + endif() +endif() + +list(APPEND FEATURE_OPTIONS + -DBOOST_LOCALE_ENABLE_ICONV=${BOOST_LOCALE_ENABLE_ICONV} + -DBOOST_LOCALE_ENABLE_POSIX=${BOOST_LOCALE_ENABLE_POSIX} + ) + + + # BOOST_LOCALE_ENABLE_ICU + + # When ON, enables the ICU backend. Defaults to ON when ICU is found, OFF otherwise. + + # BOOST_LOCALE_ENABLE_ICONV + + # When ON, enables the Iconv backend. Defaults to ON when iconv is found, OFF otherwise. + + # BOOST_LOCALE_ENABLE_POSIX + + # When ON, enables the POSIX backend. Defaults to ON on POSIX systems, OFF otherwise. + + # BOOST_LOCALE_ENABLE_STD + + # When ON, enables the std::locale backend. Defaults to ON. + + # BOOST_LOCALE_ENABLE_WINAPI + + # When ON, enables the Windows API backend. Defaults to ON under Windows, OFF otherwise. diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 7d654b03aa..a71d0d6067 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -6,23 +6,14 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 515450eef186277ec60c29230e31ba600aafde6157bd815ebfe262037c61e31263a44f007bb71a8372a824161a817afff9b89ba538b4f7a2b69a030623cf5217 HEAD_REF master - PATCHES fix-dependencies.patch + PATCHES + fix-dependencies.patch + ) -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import config : requires" - "import ../config/checks/config : requires" +set(FEATURE_OPTIONS "") +include("${CMAKE_CURRENT_LIST_DIR}/features.cmake") +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}) diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 2ce1be3dd1..6359524d3e 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-locale", "version": "1.84.0", + "port-version": 1, "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "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,12 +25,11 @@ "version>=": "1.84.0" }, { - "name": "boost-iterator", + "name": "boost-headers", "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-iterator", "version>=": "1.84.0" }, { @@ -45,17 +44,9 @@ "name": "boost-utility", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "libiconv", "platform": "!uwp & !windows & !mingw" - }, - { - "name": "vcpkg-cmake", - "host": true } ], "features": { diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index c7a7cba586..3e0a8ada70 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -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} +) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index 72c0dc0f43..af2e0b0f0c 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lockfree", "version": "1.84.0", + "port-version": 1, "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "license": "BSL-1.0", @@ -22,6 +23,10 @@ "name": "boost-atomic", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -30,6 +35,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -65,10 +74,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index cc2e180850..48d97a1ad2 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -8,16 +8,8 @@ vcpkg_from_github( HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import config : requires" "import ../config/checks/config : requires" _contents "${_contents}") -string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" - "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" - "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" +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}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 1412c7c3a9..7851ea3e50 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-log", "version": "1.84.0", + "port-version": 1, "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "license": "BSL-1.0", @@ -24,8 +25,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -57,6 +57,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-interprocess", "version>=": "1.84.0" @@ -73,11 +77,6 @@ "name": "boost-iterator", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-move", "version>=": "1.84.0" @@ -159,10 +158,6 @@ "name": "boost-utility", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-winapi", "version>=": "1.84.0" @@ -170,10 +165,6 @@ { "name": "boost-xpressive", "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index e073ca42b0..9fc6af1881 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -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} +) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index edfd3a2a76..b30511e57c 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-logic", "version": "1.84.0", + "port-version": 1, "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "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" } ] diff --git a/ports/boost-math/build-old-libs.patch b/ports/boost-math/build-old-libs.patch new file mode 100644 index 0000000000..8349fd2a45 --- /dev/null +++ b/ports/boost-math/build-old-libs.patch @@ -0,0 +1,109 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e7790271c..cd08a77e4a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,104 @@ else() + + endif() + ++include(CheckCXXSourceCompiles) ++set(CMAKE_REQUIRED_LIBRARIES Boost::config) ++set(CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include") ++check_cxx_source_compiles("#include <${CMAKE_CURRENT_SOURCE_DIR}/config/has_long_double_support.cpp> \n int main() { return 0;}" BOOST_MATH_HAS_LONG_DOUBLE) ++unset(CMAKE_REQUIRED_LIBRARIES) ++unset(CMAKE_REQUIRED_INCLUDES) ++ ++set(C99_SOURCES ++ acosh ++ asinh ++ atanh ++ cbrt ++ copysign ++ erfc ++ erf ++ expm1 ++ fmax ++ fmin ++ fpclassify ++ hypot ++ lgamma ++ llround ++ log1p ++ lround ++ nextafter ++ nexttoward ++ round ++ tgamma ++ trunc ++) ++ ++set(TR1_SOURCES ++ assoc_laguerre ++ assoc_legendre ++ beta ++ comp_ellint_1 ++ comp_ellint_2 ++ comp_ellint_3 ++ cyl_bessel_i ++ cyl_bessel_j ++ cyl_bessel_k ++ cyl_neumann ++ ellint_1 ++ ellint_2 ++ ellint_3 ++ expint ++ hermite ++ laguerre ++ legendre ++ riemann_zeta ++ sph_bessel ++ sph_legendre ++ sph_neumann ++) ++ ++list(TRANSFORM C99_SOURCES PREPEND "src/tr1/" ) # OUTPUT_VARIABLE ]) ++list(TRANSFORM TR1_SOURCES PREPEND "src/tr1/" ) ++ ++list(TRANSFORM C99_SOURCES APPEND "f.cpp" OUTPUT_VARIABLE C99_SOURCESf) ++list(TRANSFORM TR1_SOURCES APPEND "f.cpp" OUTPUT_VARIABLE TR1_SOURCESf) ++ ++set(types "" f) ++ ++if(BOOST_MATH_HAS_LONG_DOUBLE) ++ list(TRANSFORM C99_SOURCES APPEND "l.cpp" OUTPUT_VARIABLE C99_SOURCESl) ++ list(TRANSFORM TR1_SOURCES APPEND "l.cpp" OUTPUT_VARIABLE TR1_SOURCESl) ++ list(APPEND types l) ++endif() ++ ++list(TRANSFORM C99_SOURCES APPEND ".cpp") ++list(TRANSFORM TR1_SOURCES APPEND ".cpp") ++ ++foreach(type IN LISTS types) ++ add_library(boost_math_tr1${type} ${TR1_SOURCES${type}}) ++ target_include_directories(boost_math_tr1${type} PRIVATE src/tr1) ++ target_include_directories(boost_math_tr1${type} PRIVATE include) ++ add_library(boost_math_c99${type} ${C99_SOURCES${type}}) ++ target_include_directories(boost_math_c99${type} PRIVATE src/tr1) ++ target_include_directories(boost_math_c99${type} PRIVATE include) ++ if(BUILD_SHARED_LIBS) ++ target_compile_definitions(boost_math_tr1${type} PUBLIC BOOST_MATH_TR1_DYN_LINK=1) ++ target_compile_definitions(boost_math_c99${type} PUBLIC BOOST_MATH_TR1_DYN_LINK=1) ++ if(MSVC) ++ target_compile_definitions(boost_math_tr1${type} PRIVATE "BOOST_SYMBOL_EXPORT=__declspec(dllexport)" BOOST_ALL_NO_LIB) ++ target_compile_definitions(boost_math_c99${type} PRIVATE "BOOST_SYMBOL_EXPORT=__declspec(dllexport)" BOOST_ALL_NO_LIB) ++ endif() ++ endif() ++ target_compile_features(boost_math_tr1${type} PUBLIC cxx_std_11) ++ target_compile_features(boost_math_c99${type} PUBLIC cxx_std_11) ++ if(DARWIN) ++ target_compile_definitions(boost_math_tr1${type} PRIVATE _DARWIN_C_SOURCE) ++ target_compile_definitions(boost_math_c99${type} PRIVATE _DARWIN_C_SOURCE) ++ endif() ++ boost_install_target(TARGET boost_math_tr1${type} VERSION ${BOOST_SUPERPROJECT_VERSION}) ++ boost_install_target(TARGET boost_math_c99${type} VERSION ${BOOST_SUPERPROJECT_VERSION}) ++endforeach() ++ ++ + # Only enable tests when we're the root project + if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + diff --git a/ports/boost-math/opt-random.diff b/ports/boost-math/opt-random.diff new file mode 100644 index 0000000000..d5892746c4 --- /dev/null +++ b/ports/boost-math/opt-random.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cf695409e4..ea9ffdf8eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,7 +34,7 @@ else() + Boost::integer + Boost::lexical_cast + Boost::predef +- Boost::random ++ $ + Boost::static_assert + Boost::throw_exception + ) diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index fc9e7ce004..7258688ae3 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 5f5aec5c7c2de137fc8b69e33a3f0aa6c18b63292a66508cb68c86d3c1c27455f73432218e90cbd47e919e0be84a6d25af39aa1c4b9a223c013a948c029b7251 HEAD_REF master + PATCHES + build-old-libs.patch + opt-random.diff ) -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}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index 0bc4e49057..a09b366852 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-math", "version": "1.84.0", + "port-version": 1, "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "license": "BSL-1.0", @@ -11,8 +12,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-integer", "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-predef", "version>=": "1.84.0" @@ -56,14 +55,6 @@ { "name": "boost-throw-exception", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index a51e8f55c5..1b9771c42f 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -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} +) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index 53da7ad7fb..21885e6315 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -2,14 +2,23 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-metaparse", "version": "1.84.0", + "port-version": 1, "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "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-mpl", "version>=": "1.84.0" @@ -29,10 +38,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt deleted file mode 100644 index aaa168aaae..0000000000 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ /dev/null @@ -1,326 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -project(boost NONE) - -# The following variables are used in user-config.jam file -set(USER_CONFIG_TOOLSET "") -set(USER_CONFIG_TOOLSET_VERSION "") -set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "") -set(USER_CONFIG_TOOLSET_OPTIONS "") -set(USER_CONFIG_EXTRA_LINES "") -set(USER_CONFIG_REQUIREMENTS "") - -# Avoid forcing initialization of B2_OPTIONS here to allow some users to add custom configuration options to this command via VCPKG_CHAINLOAD_TOOLCHAIN_FILE. -if(NOT DEFINED B2_OPTIONS) - set(B2_OPTIONS "") -endif() - - -include("${VCPKG_CMAKE_VARS_FILE}") - -# Add build type specific options -if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - list(APPEND B2_OPTIONS runtime-link=shared) -else() - list(APPEND B2_OPTIONS runtime-link=static) -endif() - -if(BUILD_SHARED_LIBS) - list(APPEND B2_OPTIONS link=shared) -else() - list(APPEND B2_OPTIONS link=static) -endif() - -if(VCPKG_DETECTED_CMAKE_SIZEOF_VOID_P EQUAL "8") - list(APPEND B2_OPTIONS address-model=64) -else() - list(APPEND B2_OPTIONS address-model=32) -endif() - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") - list(APPEND B2_OPTIONS architecture=s390x) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - list(APPEND B2_OPTIONS architecture=arm) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") - list(APPEND B2_OPTIONS architecture=power) -elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch") - list(APPEND B2_OPTIONS architecture=loongarch) -elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips64") - list(APPEND B2_OPTIONS architecture=mips64) -elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "riscv") - list(APPEND B2_OPTIONS architecture=riscv) -elseif("arm64" IN_LIST VCPKG_TARGET_ARCHITECTURE AND "x86_64" IN_LIST VCPKG_TARGET_ARCHITECTURE) - list(APPEND B2_OPTIONS architecture=arm+x86) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") - # do nothing -else() - list(APPEND B2_OPTIONS architecture=x86) -endif() - -if(VCPKG_DETECTED_MSVC) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - list(APPEND B2_OPTIONS "asmflags=/safeseh") - endif() - - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang-win) - else() - set(USER_CONFIG_TOOLSET msvc) - if(VCPKG_DETECTED_MSVC_VERSION LESS "1900") - math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60") - elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1910") - set(USER_CONFIG_TOOLSET_VERSION "140") - elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1920") - set(USER_CONFIG_TOOLSET_VERSION "141") - elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1930") - set(USER_CONFIG_TOOLSET_VERSION "142") - elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1950") - set(USER_CONFIG_TOOLSET_VERSION "143") - else() - message(FATAL_ERROR "Unsupported MSVC version: ${VCPKG_DETECTED_MSVC_VERSION}") - endif() - endif() -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") - set(USER_CONFIG_TOOLSET emscripten) -elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(USER_CONFIG_TOOLSET clang) -elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "NVHPC") - set(USER_CONFIG_TOOLSET pgi) -else() - set(USER_CONFIG_TOOLSET gcc) -endif() - -if(WIN32) - list(APPEND B2_OPTIONS target-os=windows) -elseif(APPLE) - if(IOS) - list(APPEND B2_OPTIONS target-os=iphone) - else() - list(APPEND B2_OPTIONS target-os=darwin) - endif() -elseif(ANDROID) - list(APPEND B2_OPTIONS target-os=android) -elseif(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - list(APPEND B2_OPTIONS target-os=freebsd) -else() - list(APPEND B2_OPTIONS target-os=linux) -endif() - -# Properly handle compiler and linker flags passed by VCPKG -string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE) - -set(CXXFLAGS "${VCPKG_COMBINED_CXX_FLAGS_${UPPER_BUILD_TYPE}}") -set(CFLAGS "${VCPKG_COMBINED_C_FLAGS_${UPPER_BUILD_TYPE}}") -set(LDFLAGS "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") -set(ARFLAGS "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") - -if(APPLE) - string(APPEND COMPILEFLAGS " -D_DARWIN_C_SOURCE") - if(NOT CXXFLAGS MATCHES " -std=") - # If the user hasn't provided their own standard flag, use at least c++11 - string(APPEND CXXFLAGS " -std=c++11") - endif() -endif() - -if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - # cl in b2 appears to not receive `LIBPATH` for finding winmd files, so we transform them to `/AI` options. - set(libpath_args "$ENV{LIBPATH}") - # Apply: {x -> /AI"x"} - list(TRANSFORM libpath_args PREPEND "/AI\"") - list(TRANSFORM libpath_args APPEND "\"") - list(JOIN libpath_args " " libpath_arg) - string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") - list(APPEND B2_OPTIONS windows-api=store) - list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) # TODO: Fix this; Probably should use a VCPKG_DETECTED_ variable and also be applied in the !store case -endif() - -set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\"") - -string(APPEND CXXFLAGS "${COMPILEFLAGS}") -string(APPEND CFLAGS "${COMPILEFLAGS}") - -foreach(var CXXFLAGS CFLAGS LDFLAGS ARFLAGS) - string(REPLACE [[\]] [[\\]] ${var} "${${var}}") - string(REPLACE [["]] [[\"]] ${var} "${${var}}") - if(WIN32) - # env variables need extra %%var%% to be not expanded early - string(REGEX REPLACE [[(%[^%]+%)]] [[%\1%]] ${var} "${${var}}") - # remove PDB flag, until the pdb install rule of boost-build can be deactivated. - string(REGEX REPLACE "-PDB:[^ ]+" "" ${var} "${${var}}") - endif() - string(REGEX REPLACE "[ \t\r\n]+" " " ${var} "${${var}}") - string(STRIP "${${var}}" ${var}) -endforeach() - -if(CFLAGS MATCHES "-Zi" OR CXXFLAGS MATCHES "-Zi") - list(APPEND B2_OPTIONS - debug-store=database - pch=off - ) -endif() - -if(USER_CONFIG_TOOLSET MATCHES "^(msvc|clang-win)$") - file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) - string(APPEND USER_CONFIG_TOOLSET_OPTIONS - " \"${NOTHING_BAT}\"\n" - ) - if(NOT ARFLAGS STREQUAL "") - # Only apply these flags for MSVC - string(APPEND USER_CONFIG_REQUIREMENTS "\"${ARFLAGS}\"\n ") - endif() -else() - string(APPEND USER_CONFIG_TOOLSET_OPTIONS - " \"${VCPKG_DETECTED_CMAKE_RANLIB}\"\n" - " \"${VCPKG_DETECTED_CMAKE_AR}\"\n" - ) -endif() - -if(NOT CXXFLAGS STREQUAL "") - string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CXXFLAGS}\"\n") -endif() -if(NOT CFLAGS STREQUAL "") - string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CFLAGS}\"\n \"${CFLAGS}\"\n") -endif() -if(NOT LDFLAGS STREQUAL "") - string(APPEND USER_CONFIG_REQUIREMENTS "\"${LDFLAGS}\"\n ") - string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${LDFLAGS}\"\n") -endif() - -if(WIN32 AND NOT USER_CONFIG_TOOLSET MATCHES "^(msvc|clang-win)$") - # MINGW here causes b2 to not run cygpath - string(APPEND USER_CONFIG_TOOLSET_OPTIONS - " mingw\n" - ) -endif() - -if(WIN32) - list(APPEND B2_OPTIONS threadapi=win32) -else() - list(APPEND B2_OPTIONS threadapi=pthread) -endif() - -if(CMAKE_BUILD_TYPE STREQUAL "Release") - list(APPEND B2_OPTIONS variant=release) -else() - list(APPEND B2_OPTIONS variant=debug) -endif() - -if(NOT WIN32) - list(APPEND B2_OPTIONS "--layout=system") -endif() - - -# Handle ICU -if(WIN32) - list(APPEND B2_OPTIONS "--disable-icu") -else() - find_path(ICU_PATH include/unicode/utf.h) - list(APPEND B2_OPTIONS "-sICU_PATH=\"${ICU_PATH}\"") -endif() - -# Handle Python -set(python_versions "") - -if(WITH_PYTHON2) - # Find Python2 in the current installed directory - file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") - string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") - string(APPEND USER_CONFIG_EXTRA_LINES - "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" - "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n" - ) - list(APPEND python_versions "${python2_version}") -endif() - -if(WITH_PYTHON3) - # Find Python3 in the current installed directory - file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") - string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") - string(APPEND USER_CONFIG_EXTRA_LINES - "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" - "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n" - ) - list(APPEND python_versions "${python3_version}") -endif() - -if(NOT python_versions STREQUAL "") - list(JOIN python_versions "," python_versions) - list(APPEND B2_OPTIONS "python=${python_versions}") - - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND B2_OPTIONS "python-debugging=on") - endif() -endif() - -# Remove duplicates from B2_OPTIONS since VCPKG_CHAINLOAD_TOOLCHAIN_FILE may be loaded multiple times in some cases. -list(REMOVE_DUPLICATES B2_OPTIONS) - -if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") - string(APPEND USER_CONFIG_EXTRA_LINES - "using mpi : : \"${CURRENT_INSTALLED_DIR}/lib\"\n" - " \"${CURRENT_INSTALLED_DIR}/include\"\n" - ) - if(WIN32) - string(APPEND USER_CONFIG_EXTRA_LINES - " msmpi ;\n" - ) - else() - string(APPEND USER_CONFIG_EXTRA_LINES - " openmpi ;\n" - ) - endif() -endif() - -# Include port specific CMake fragment -if(DEFINED BOOST_CMAKE_FRAGMENT) - message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") - include(${BOOST_CMAKE_FRAGMENT}) -endif() - -configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam.in ${CMAKE_CURRENT_BINARY_DIR}/user-config.jam @ONLY) - -add_custom_target(boost ALL - COMMAND "${B2_EXE}" - toolset=${USER_CONFIG_TOOLSET} - --user-config=${CMAKE_CURRENT_BINARY_DIR}/user-config.jam - --stagedir=${CMAKE_CURRENT_BINARY_DIR}/stage - --build-dir=${CMAKE_CURRENT_BINARY_DIR} - ${B2_OPTIONS} - --with-atomic - --with-random - --with-date_time - --with-filesystem - --with-system - --with-thread - --with-chrono - -j ${VCPKG_CONCURRENCY} - -sBOOST_ROOT=${BOOST_BUILD_PATH} - -sBOOST_BUILD_PATH=${BOOST_BUILD_PATH} - --debug-configuration - --debug-building - --debug-generators - --ignore-site-config - --hash - -q - debug-symbols=on - # Enable debugging level 2. - -d +2 - - threading=multi - - stage - WORKING_DIRECTORY "${SOURCE_PATH}/build" -) - -set(SUBDIR "${CMAKE_CURRENT_BINARY_DIR}/stage/lib") -install( - CODE " -file(GLOB LIBS \"${SUBDIR}/*.so.*\" \"${SUBDIR}/*.so\" \"${SUBDIR}/*.a\" \"${SUBDIR}/*.dylib\" \"${SUBDIR}/*.dylib.*\" \"${SUBDIR}/*.lib\") -if(LIBS) - file(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\") -endif() -file(GLOB DLLS \"${SUBDIR}/*.dll\" \"${SUBDIR}/*.pyd\") -if(DLLS) - file(INSTALL \${DLLS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\") -endif() -" -) diff --git a/ports/boost-modular-build-helper/Jamroot.jam.in b/ports/boost-modular-build-helper/Jamroot.jam.in deleted file mode 100644 index 83d7c9a334..0000000000 --- a/ports/boost-modular-build-helper/Jamroot.jam.in +++ /dev/null @@ -1,207 +0,0 @@ -constant BOOST_VERSION : @BOOST_VERSION@ ; -constant BOOST_VERSION_ABI_TAG : @BOOST_VERSION_ABI_TAG@ ; -constant BOOST_JAMROOT_MODULE : $(__name__) ; - -import boostcpp ; -import feature ; -import configure ; - -boostcpp.set-version $(BOOST_VERSION) ; - -project boost : requirements - include&&"@CURRENT_INSTALLED_DIR@/include" - BOOST_ALL_NO_LIB=1 - @$(__name__).tag - @B2_REQUIREMENTS@ - ; - -rule boost-install ( libraries * ) -{ - stagedir = [ option.get stagedir ] ; - install stage - : $(libraries) - : $(stagedir)/lib ; -} - -rule tag ( name : type ? : property-set ) -{ - return [ boostcpp.tag $(name) : $(type) : $(property-set) ] ; -} - -rule python-tag ( name : type ? : property-set ) -{ - return [ boostcpp.python-tag $(name) : $(type) : $(property-set) ] ; -} - -if "@PORT@" != "boost-system" -{ - use-project /boost/system : . ; - - lib boost_system : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_system : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_system ; - - use-project /boost : . ; - alias system : boost_system ; -} - -if "@PORT@" != "boost-chrono" -{ - use-project /boost/chrono : . ; - - lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_chrono ; -} - -if "@PORT@" != "boost-regex" -{ - use-project /boost/regex : . ; - - lib boost_regex : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_regex : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_regex ; -} - -if "@PORT@" != "boost-date-time" -{ - use-project /boost/date_time : . ; - - lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_RELEASE_SUFFIX@" release -/boost/date_time//boost_date_time ; - lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_DEBUG_SUFFIX@" debug -/boost/date_time//boost_date_time ; - explicit boost_date_time ; -} - -if "@PORT@" != "boost-thread" -{ - use-project /boost/thread : . ; - - lib boost_thread : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/date_time//boost_date_time ; - lib boost_thread : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/date_time//boost_date_time ; - explicit boost_thread ; -} - -if "@PORT@" != "boost-timer" -{ - use-project /boost/timer : . ; - - lib boost_timer : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_timer : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_timer ; -} - -if "@PORT@" != "boost-filesystem" -{ - use-project /boost/filesystem : . ; - - lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/system//boost_system ; - lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/system//boost_system ; - explicit boost_filesystem ; -} - -if "@PORT@" != "boost-atomic" -{ - lib synchronization ; - explicit synchronization ; - - exe has_synchronization_lib : "@CURRENT_INSTALLED_DIR@/share/boost-atomic/has_synchronization_lib.cpp" : synchronization ; - explicit has_synchronization_lib ; - - rule check-synchronization-lib ( properties * ) - { - local result ; - - if windows in $(properties) - { - if [ configure.builds has_synchronization_lib : $(properties) : "has synchronization.lib" ] - { - result += synchronization ; - } - else - { - result += BOOST_ATOMIC_NO_SYNCHRONIZATION_LIB ; - } - } - - return $(result) ; - } - use-project /boost/atomic : . ; - - lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" release : : usage-requirements - @check-synchronization-lib ; - lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" debug : : usage-requirements - @check-synchronization-lib ; - explicit boost_atomic ; -} - -if "@PORT@" != "boost-context" -{ - feature.feature segmented-stacks : on : optional propagated composite ; - feature.compose on : BOOST_USE_SEGMENTED_STACKS ; - - use-project /boost/context : . ; - - lib boost_context : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_context : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_context ; -} - -if "@PORT@" != "boost-test" -{ - use-project /boost/test : . ; - - lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_unit_test_framework ; -} - -if "@PORT@" != "boost-serialization" -{ - use-project /boost/serialization : . ; - - lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_serialization ; -} - -if "@PORT@" != "boost-mpi" -{ - use-project /boost/mpi : . ; - - lib boost_mpi : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_mpi@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/serialization//boost_serialization ; - lib boost_mpi : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_mpi@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/serialization//boost_serialization ; - explicit boost_mpi ; -} - -if "@PORT@" != "boost-container" -{ - use-project /boost/container : . ; - - lib boost_container : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_container@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_container : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_container@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_container ; -} - -if "@PORT@" != "boost-python" -{ - use-project /boost/python : . ; - - lib boost_python : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_python@PYTHON_VERSION_TAG@@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_python : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_python@PYTHON_VERSION_TAG@@BOOST_LIB_DEBUG_SUFFIX@" debug ; - explicit boost_python ; -} - -rule requires ( foo * ) -{ -} - -rule boost-lib ( name : sources * : requirements * : default-build * : usage-requirements * ) -{ - name = boost_$(name) ; - lib $(name) : $(sources) : $(requirements) : $(default-build) : $(usage-requirements) ; - boost-install $(name) ; -} - -use-project /boost/@PORT@ : build ; - -build-project build ; diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake deleted file mode 100644 index 0bbd31be82..0000000000 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ /dev/null @@ -1,200 +0,0 @@ -include_guard(GLOBAL) -include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") - -get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) -get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) - -set(BOOST_VERSION "${VERSION}") -string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") -if("${CMAKE_MATCH_3}" GREATER 0) - set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") -else() - set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}") -endif() - -function(boost_modular_build) - cmake_parse_arguments(_bm "" "SOURCE_PATH;BOOST_CMAKE_FRAGMENT" "" ${ARGN}) - - if(NOT DEFINED _bm_SOURCE_PATH) - message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.") - endif() - - # The following variables are used in the Jamroot.jam - set(B2_REQUIREMENTS) - - # Some CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT} - if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) - message(STATUS "Including ${_bm_BOOST_CMAKE_FRAGMENT}") - include(${_bm_BOOST_CMAKE_FRAGMENT}) - endif() - - set(BOOST_BUILD_PATH "${BOOST_BUILD_INSTALLED_DIR}/tools/boost-build") - - if(EXISTS "${BOOST_BUILD_PATH}/b2.exe") - set(B2_EXE "${BOOST_BUILD_PATH}/b2.exe") - elseif(EXISTS "${BOOST_BUILD_PATH}/b2") - set(B2_EXE "${BOOST_BUILD_PATH}/b2") - else() - message(FATAL_ERROR "Could not find b2 in ${BOOST_BUILD_PATH}") - endif() - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(BOOST_LIB_PREFIX) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.") - set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib) - set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") - set(BOOST_LIB_RELEASE_SUFFIX -vc120-mt.lib) - set(BOOST_LIB_DEBUG_SUFFIX -vc120-mt-gd.lib) - else() - set(BOOST_LIB_RELEASE_SUFFIX .lib) - set(BOOST_LIB_DEBUG_SUFFIX d.lib) - endif() - else() - set(BOOST_LIB_PREFIX lib) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") - set(BOOST_LIB_RELEASE_SUFFIX .a) - set(BOOST_LIB_DEBUG_SUFFIX .a) - elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BOOST_LIB_RELEASE_SUFFIX .a) - set(BOOST_LIB_DEBUG_SUFFIX .a) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(BOOST_LIB_RELEASE_SUFFIX .dylib) - set(BOOST_LIB_DEBUG_SUFFIX .dylib) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") - set(BOOST_LIB_RELEASE_SUFFIX .dll.a) - set(BOOST_LIB_DEBUG_SUFFIX .dll.a) - else() - set(BOOST_LIB_RELEASE_SUFFIX .so) - set(BOOST_LIB_DEBUG_SUFFIX .so) - endif() - endif() - - set(_jamfile) - if(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile.v2") - set(_jamfile "${_bm_SOURCE_PATH}/build/Jamfile.v2") - elseif(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile") - set(_jamfile "${_bm_SOURCE_PATH}/build/Jamfile") - endif() - if(_jamfile) - file(READ "${_jamfile}" _contents) - string(REGEX REPLACE - "\.\./\.\./([^/ ]+)/build//(boost_[^/ \n\r]+)" - "/boost/\\1//\\2" - _contents - "${_contents}" - ) - string(REGEX REPLACE "/boost//([^/ \n\r]+)" "/boost/\\1//boost_\\1" _contents "${_contents}") - file(WRITE "${_jamfile}" "${_contents}") - endif() - - if("python2" IN_LIST FEATURES) - # Find Python2 in the current installed directory - file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") - string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") - string(REPLACE "." "" PYTHON_VERSION_TAG "${python2_version}") - endif() - if("python3" IN_LIST FEATURES) - # Find Python3 in the current installed directory - file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") - string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") - string(REPLACE "." "" PYTHON_VERSION_TAG "${python3_version}") - endif() - - configure_file("${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in" "${_bm_SOURCE_PATH}/Jamroot.jam" @ONLY) - - set(configure_options) - if(_bm_BOOST_CMAKE_FRAGMENT) - list(APPEND configure_options "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") - endif() - - vcpkg_cmake_get_vars(cmake_vars_file) - - vcpkg_check_features( - OUT_FEATURE_OPTIONS feature_options - FEATURES - python2 WITH_PYTHON2 - python3 WITH_PYTHON3 - ) - - vcpkg_cmake_configure( - SOURCE_PATH "${BOOST_BUILD_INSTALLED_DIR}/share/boost-build" - GENERATOR Ninja - OPTIONS - "-DPORT=${PORT}" - "-DFEATURES=${FEATURES}" - ${feature_options} - "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" - "-DB2_EXE=${B2_EXE}" - "-DSOURCE_PATH=${_bm_SOURCE_PATH}" - "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}" - "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" - "-DVCPKG_CMAKE_VARS_FILE=${cmake_vars_file}" - "-DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY}" - ${configure_options} - MAYBE_UNUSED_VARIABLES - FEATURES - ) - - vcpkg_cmake_install() - - vcpkg_copy_pdbs( - BUILD_PATHS - "${CURRENT_PACKAGES_DIR}/bin/*.dll" - "${CURRENT_PACKAGES_DIR}/bin/*.pyd" - "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" - "${CURRENT_PACKAGES_DIR}/debug/bin/*.pyd" - ) - - file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib" "${CURRENT_PACKAGES_DIR}/lib/*.lib") - foreach(LIB IN LISTS INSTALLED_LIBS) - get_filename_component(OLD_FILENAME ${LIB} NAME) - get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY) - string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME}) - string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs - string(REGEX REPLACE "-vc14[1-9]-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 VS2019 VS2017 and VS2015 binaries - string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs - string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs - string(REPLACE "-gyd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs with python debugging - string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-${BOOST_VERSION_ABI_TAG}" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries - if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") - # nothing to do - elseif(EXISTS "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") - file(REMOVE "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") - else() - file(RENAME "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}" "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") - endif() - endforeach() - # Similar for mingw - file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*-mgw*-*.a" "${CURRENT_PACKAGES_DIR}/lib/*-mgw*-*.a") - foreach(LIB IN LISTS INSTALLED_LIBS) - get_filename_component(OLD_FILENAME "${LIB}" NAME) - get_filename_component(DIRECTORY_OF_LIB_FILE "${LIB}" DIRECTORY) - string(REGEX REPLACE "-mgw[0-9]+-.*[0-9](\\.dll\\.a|\\.a)$" "\\1" NEW_FILENAME "${OLD_FILENAME}") - if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") - # nothing to do - elseif(EXISTS "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") - file(REMOVE "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") - else() - file(RENAME "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}" "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") - endif() - endforeach() - - # boost-regex[icu] and boost-locale[icu] generate has_icu.lib - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib") - endif() - - if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/lib") - message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.") - endif() - - configure_file("${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) -endfunction() diff --git a/ports/boost-modular-build-helper/nothing.bat b/ports/boost-modular-build-helper/nothing.bat deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ports/boost-modular-build-helper/portfile.cmake b/ports/boost-modular-build-helper/portfile.cmake deleted file mode 100644 index 3caa70b6c2..0000000000 --- a/ports/boost-modular-build-helper/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -file( - COPY - ${CMAKE_CURRENT_LIST_DIR}/boost-modular-build.cmake - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam.in - ${CMAKE_CURRENT_LIST_DIR}/nothing.bat - ${CMAKE_CURRENT_LIST_DIR}/usage - ${CMAKE_CURRENT_LIST_DIR}/user-config.jam.in - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/boost-build -) \ No newline at end of file diff --git a/ports/boost-modular-build-helper/user-config.jam.in b/ports/boost-modular-build-helper/user-config.jam.in deleted file mode 100644 index fccfa1a43e..0000000000 --- a/ports/boost-modular-build-helper/user-config.jam.in +++ /dev/null @@ -1,53 +0,0 @@ -import toolset ; - -using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLSET_INVOCATION_COMMAND@ - : -@USER_CONFIG_TOOLSET_OPTIONS@ - ; - -@USER_CONFIG_EXTRA_LINES@ - -project user-config : requirements @USER_CONFIG_REQUIREMENTS@ ; - -if "@USER_CONFIG_TOOLSET@" = "msvc" || "@USER_CONFIG_TOOLSET@" = "clang-win" -{ - lib advapi32 ; - - lib icuuc : : "@CURRENT_INSTALLED_DIR@/lib/icuuc.lib" release : : advapi32 ; - lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" debug : : advapi32 ; - - lib icuin : : "@CURRENT_INSTALLED_DIR@/lib/icuin.lib" release : : ; - lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" debug : : ; - - lib icudt : : "@CURRENT_INSTALLED_DIR@/lib/icudt.lib" release : : ; - lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" debug : : ; -} -else -{ - if "@CMAKE_SYSTEM_NAME@" = "Windows" # We are hopelessly stuck inside boost-modular-build-helper, only this works - { - lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuuc : : icuucd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - - lib icuin : : icuin "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuin : : icuind "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - - lib icudt : : icudt "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icudt : : icudtd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - } - else - { - lib dl ; - lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : dl ; - lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : dl ; - - lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - - lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - } -} - -lib iconv : : "@VCPKG_ICONV_LIBRARY_RELEASE@" shared shared release : : ; -lib iconv : : "@VCPKG_ICONV_LIBRARY_DEBUG@" shared shared debug : : ; diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index c942bb337f..7f7c932599 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -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} +) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index d748268607..012023c599 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-move", "version": "1.84.0", + "port-version": 1, "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "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" } ] diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 9b624629df..33ca407eb8 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -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} +) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 2cc0ea9338..15fd880b7f 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mp11", "version": "1.84.0", + "port-version": 1, "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "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" } ] diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index 4fd6e37ef8..db3bc47269 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -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} +) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index e09c0fa6a6..7f34f223ed 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpi", "version": "1.84.0", + "port-version": 1, "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "license": "BSL-1.0", @@ -12,8 +13,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -36,6 +36,10 @@ "name": "boost-graph", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -48,11 +52,6 @@ "name": "boost-lexical-cast", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -85,15 +84,7 @@ "name": "boost-utility", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - "mpi", - { - "name": "vcpkg-cmake", - "host": true - } + "mpi" ], "features": { "python3": { diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index ae4ba4c3f1..772075b665 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -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} +) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index a28a567691..006e71356e 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpl", "version": "1.84.0", + "port-version": 1, "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "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-predef", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index d673c18de3..f0322e4446 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -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} +) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index bbdb08fc1b..964ceab96a 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-msm", "version": "1.84.0", + "port-version": 1, "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "license": "BSL-1.0", @@ -22,6 +23,10 @@ "name": "boost-circular-buffer", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -38,6 +43,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -73,10 +82,6 @@ { "name": "boost-typeof", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 156e9e337e..faabf66aa5 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -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} +) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index 358d4ebb88..c19397f462 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-array", "version": "1.84.0", + "port-version": 1, "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-assert", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-concept-check", "version>=": "1.84.0" @@ -30,6 +35,10 @@ "name": "boost-functional", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -45,10 +54,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index d10a10156e..793b6e8917 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -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} +) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index f2bb3f4a25..feda866670 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-index", "version": "1.84.0", + "port-version": 1, "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-bind", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -26,6 +31,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -69,10 +78,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 333ce9ef34..0df4b06f1f 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -6,7 +6,12 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 7173006ac8b305eee2cfea3a88ea56ce85e48cc72eeeed360c115b3d4390e7f112b518a12b0bf6a9e6080bf7b0616b6f2d41c6a624f65a377584123add12908c HEAD_REF master + PATCHES + remove-random.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} +) diff --git a/ports/boost-multiprecision/remove-random.diff b/ports/boost-multiprecision/remove-random.diff new file mode 100644 index 0000000000..edd152d59b --- /dev/null +++ b/ports/boost-multiprecision/remove-random.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6cdd2861e..fabfe26023 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,6 @@ else() + Boost::integer + Boost::lexical_cast + Boost::math +- Boost::random + ) + + endif() diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index c208f6c5bb..f7b0093fb8 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multiprecision", "version": "1.84.0", + "port-version": 1, "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "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-integer", "version>=": "1.84.0" @@ -42,10 +51,6 @@ { "name": "boost-throw-exception", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-mysql/portfile.cmake b/ports/boost-mysql/portfile.cmake index f3cdfb2cdf..fdd322003c 100644 --- a/ports/boost-mysql/portfile.cmake +++ b/ports/boost-mysql/portfile.cmake @@ -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} +) diff --git a/ports/boost-mysql/vcpkg.json b/ports/boost-mysql/vcpkg.json index 3dd2892f5a..86ecd5fc91 100644 --- a/ports/boost-mysql/vcpkg.json +++ b/ports/boost-mysql/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mysql", "version": "1.84.0", + "port-version": 1, "description": "Boost mysql module", "homepage": "https://github.com/boostorg/mysql", "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" @@ -30,6 +35,10 @@ "name": "boost-endian", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-lexical-cast", "version>=": "1.84.0" @@ -50,9 +59,6 @@ "name": "boost-variant2", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - } + "openssl" ] } diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index 85be3b7591..88fc5bab97 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -8,12 +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}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index acad2d0914..864151fccf 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -2,13 +2,13 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-nowide", "version": "1.84.0", + "port-version": 1, "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "license": "BSL-1.0", "dependencies": [ { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -21,17 +21,8 @@ "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-headers", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 96a1c33804..ff267414fc 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -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} +) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index afc3c9610b..e12338b617 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-numeric-conversion", "version": "1.84.0", + "port-version": 1, "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "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-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-odeint/opt-mpi.diff b/ports/boost-odeint/opt-mpi.diff new file mode 100644 index 0000000000..80441e1eb0 --- /dev/null +++ b/ports/boost-odeint/opt-mpi.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3692bea4a7..29ee7adb1c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ target_link_libraries(boost_numeric_odeint + Boost::fusion + Boost::iterator + Boost::math +- Boost::mpi ++ $ + Boost::mpl + Boost::multi_array + Boost::numeric_ublas diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 4475631a39..293af6be96 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -6,7 +6,12 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 ea48b08fe00b9075af80f6f2614a639fd84b146ecfed229ae2ce23745a6a6d85b4d607ee2b199134848c87562ef8145aba0ff063a862653b3f01512de5717234 HEAD_REF master + PATCHES + opt-mpi.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} +) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index b2458eaf6b..de40b8ee2a 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-odeint", "version": "1.84.0", + "port-version": 1, "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "license": "BSL-1.0", @@ -18,6 +19,10 @@ "name": "boost-bind", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-compute", "version>=": "1.84.0" @@ -38,6 +43,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-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ], "features": { diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 46fc9dc57b..2e10109755 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -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} +) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 89ad178d6c..0efb306135 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-optional", "version": "1.84.0", + "port-version": 1, "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "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-detail", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-move", "version>=": "1.84.0" @@ -45,10 +54,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index b5269e5f6f..1a5d84ebdb 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -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} +) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index 5e54396c74..9c062df74e 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-outcome", "version": "1.84.0", + "port-version": 1, "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "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-exception", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-system", "version>=": "1.84.0" @@ -21,10 +30,6 @@ { "name": "boost-throw-exception", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index e56e03bcd9..9e3c440bbc 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -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} +) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index 54a8968ef1..edc45064b7 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -2,15 +2,24 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter-python", "version": "1.84.0", + "port-version": 1, "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -25,11 +34,6 @@ }, { "name": "boost-python", - "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", "version>=": "1.84.0" } ] diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index 770d9a63df..a4e9d6b7b2 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -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} +) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 4d560f5c66..cb3f6e1415 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter", "version": "1.84.0", + "port-version": 1, "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "license": "BSL-1.0", "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -22,6 +27,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mp11", "version>=": "1.84.0" @@ -45,10 +54,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index ecb17d4e21..2ecd7efe9c 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -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} +) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index 85d8140f7a..af1225c913 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pfr", "version": "1.84.0", + "port-version": 1, "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "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" } ] diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 9da56ba773..793a302b2a 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -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} +) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index 39ceb2bfb7..e59032e675 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-phoenix", "version": "1.84.0", + "port-version": 1, "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-bind", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -30,6 +35,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -61,10 +70,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index a0edaea9c2..2f692efe3c 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -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} +) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 3c96c22224..4ad855a874 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-poly-collection", "version": "1.84.0", + "port-version": 1, "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "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-iterator", "version>=": "1.84.0" @@ -37,10 +46,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index 9b256a680e..fcda54f668 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -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} +) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index e31e5f4a8b..fcb8cdc8fc 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-polygon", "version": "1.84.0", + "port-version": 1, "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "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" } ] diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 2ed47dccb1..8db1345080 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -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} +) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 46fa0be230..2d5ff3f0a7 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pool", "version": "1.84.0", + "port-version": 1, "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "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-integer", "version>=": "1.84.0" @@ -26,10 +35,6 @@ "name": "boost-type-traits", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-winapi", "version>=": "1.84.0" diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 1e5a8300c5..b604656207 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -8,7 +8,10 @@ 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} +) -file(COPY ${SOURCE_PATH}/tools/check DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-predef) +file(COPY "${SOURCE_PATH}/libs/predef/tools/check" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-predef") diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index 410d9903ee..d4aee8a7ed 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-predef", "version": "1.84.0", + "port-version": 1, "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "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" } ] diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index b78df15a96..cbc555e645 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -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} +) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index 9e90381b53..4a61bc2a13 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-preprocessor", "version": "1.84.0", + "port-version": 1, "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "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" } ] diff --git a/ports/boost-process/opt-filesystem.patch b/ports/boost-process/opt-filesystem.patch new file mode 100644 index 0000000000..0a16366680 --- /dev/null +++ b/ports/boost-process/opt-filesystem.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c0c1bfef94..3c879b8958 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ target_link_libraries(boost_process + Boost::asio + Boost::config + Boost::core +- Boost::filesystem ++ $ + Boost::fusion + Boost::iterator + Boost::move +@@ -28,6 +28,10 @@ target_link_libraries(boost_process + Boost::winapi + ) + ++if(NOT TARGET Boost::filesystem) ++ target_compile_definitions(boost_process INTERFACE $<$>:BOOST_PROCESS_USE_STD_FS>) ++endif() ++ + if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt") + + add_subdirectory(test) diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index e7d4176d65..a06540df44 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -6,7 +6,13 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 cef528d676c3a909aff4175419dee7b2c13076d1d146e42d0840724dde31a8bce5ff3b8c22d4330dbc94ec70e8d3927c782997aa49b9d7262b309e7677c03436 HEAD_REF master + PATCHES + opt-filesystem.patch + ) -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} +) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index d8694e43bb..96abd96605 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-process", "version": "1.84.0", + "port-version": 1, "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "license": "BSL-1.0", @@ -19,6 +20,10 @@ "name": "boost-assert", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -36,6 +41,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-io", "version>=": "1.84.0" @@ -76,10 +85,6 @@ "name": "boost-utility", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-winapi", "version>=": "1.84.0" diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index bdd8fd53c0..cdf0d9111d 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -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} +) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index 3e023dfc08..98a3085c18 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-program-options", "version": "1.84.0", + "port-version": 1, "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "license": "BSL-1.0", @@ -15,8 +16,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -35,6 +35,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -43,11 +47,6 @@ "name": "boost-lexical-cast", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-smart-ptr", "version>=": "1.84.0" @@ -67,14 +66,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-property-map-parallel/portfile.cmake b/ports/boost-property-map-parallel/portfile.cmake index 7fe5846adf..72d5da459f 100644 --- a/ports/boost-property-map-parallel/portfile.cmake +++ b/ports/boost-property-map-parallel/portfile.cmake @@ -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} +) diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json index 6a9d7f5b24..bda6fced8c 100644 --- a/ports/boost-property-map-parallel/vcpkg.json +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map-parallel", "version": "1.84.0", + "port-version": 1, "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", "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,9 +27,12 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpi", - "platform": "!uwp", "version>=": "1.84.0" }, { @@ -58,10 +66,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 1622715aa2..bbeb49d2f1 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -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} +) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 465a4951c8..5f91e68641 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map", "version": "1.84.0", + "port-version": 1, "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-assert", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-concept-check", "version>=": "1.84.0" @@ -30,6 +35,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -65,10 +74,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index bf7cec53df..d0703f19f3 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -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} +) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index 2ef6677e40..d0cd5b0915 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-tree", "version": "1.84.0", + "port-version": 1, "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "license": "BSL-1.0", @@ -18,6 +19,10 @@ "name": "boost-bind", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -26,6 +31,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -61,10 +70,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index d248fdddcc..bb4d950b22 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -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} +) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 5dcd9d18ce..3b3c997e13 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-proto", "version": "1.84.0", + "port-version": 1, "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "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-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -45,10 +54,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index d7002daaf2..112eb497de 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -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} +) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 524759b58a..2de59ed5fc 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ptr-container", "version": "1.84.0", + "port-version": 1, "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "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-config", "version>=": "1.84.0" @@ -26,6 +31,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" } ] } diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index f278cc6618..6dd6b86100 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -6,9 +6,12 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 c91f53a9d5a3aee649bb2882bdf1603e345a19f2ee45e9809aabe37cd3e760b30f26f397ede2c36bc7f33c3d10e347eed7e5d08e714ac93a6afcabccf993d507 HEAD_REF master + PATCHES + remove_undef.diff ) -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} +) diff --git a/ports/boost-python/remove_undef.diff b/ports/boost-python/remove_undef.diff new file mode 100644 index 0000000000..65e6b4e732 --- /dev/null +++ b/ports/boost-python/remove_undef.diff @@ -0,0 +1,28 @@ +diff --git a/fabscript b/fabscript +index 8188779fd..6a136d82a 100644 +--- a/fabscript ++++ b/fabscript +@@ -28,7 +28,7 @@ class has_numpy(try_run): + src = r""" + // If defined, enforces linking against PythonXXd.lib, which + // is usually not included in Python environments. +-#undef _DEBUG ++ + #include "Python.h" + #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION + #include "numpy/arrayobject.h" +diff --git a/include/boost/detail/wrap_python.hpp b/include/boost/detail/wrap_python.hpp +index 037e4bf2e..a690913f2 100644 +--- a/include/boost/python/detail/wrap_python.hpp ++++ b/include/boost/python/detail/wrap_python.hpp +@@ -42,8 +42,8 @@ + # include + # include + # endif +-# undef _DEBUG // Don't let Python force the debug library just because we're debugging. +-# define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H ++//# undef _DEBUG // Don't let Python force the debug library just because we're debugging. ++//# define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H + # endif + #endif + diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index b017970b3a..5384d0de67 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-python", "version": "1.84.0", + "port-version": 1, "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "license": "BSL-1.0", @@ -16,8 +17,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -48,6 +48,10 @@ "name": "boost-graph", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -60,11 +64,6 @@ "name": "boost-lexical-cast", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -100,14 +99,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ], "default-features": [ diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 88e31b48bb..17b701f9ee 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -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} +) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index b53236c357..b04df1ea6e 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-qvm", "version": "1.84.0", + "port-version": 1, "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "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" } ] diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index c7dffdcd32..fee093a4f7 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -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} +) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 263285b659..e26b44ea89 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-random", "version": "1.84.0", + "port-version": 1, "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "license": "BSL-1.0", @@ -16,8 +17,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -32,6 +32,10 @@ "name": "boost-dynamic-bitset", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -40,11 +44,6 @@ "name": "boost-io", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-range", "version>=": "1.84.0" @@ -68,14 +67,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index 8fcd9e4955..0fcaaefef5 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -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} +) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index f6fb5d6102..9222c6e676 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-range", "version": "1.84.0", + "port-version": 1, "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-assert", "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-detail", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -73,10 +82,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 52faf9b5f4..2d98319320 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -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} +) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index 1d2965d090..8ccb336707 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ratio", "version": "1.84.0", + "port-version": 1, "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "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" } ] diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 1177ad65c7..ea3b9a13ce 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -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} +) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index 8e0b633a56..67a2d88323 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-rational", "version": "1.84.0", + "port-version": 1, "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "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-integer", "version>=": "1.84.0" @@ -37,10 +46,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-redis/portfile.cmake b/ports/boost-redis/portfile.cmake index 2f6c54a38b..cf692980e9 100644 --- a/ports/boost-redis/portfile.cmake +++ b/ports/boost-redis/portfile.cmake @@ -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} +) diff --git a/ports/boost-redis/vcpkg.json b/ports/boost-redis/vcpkg.json index 4aa2104d52..727669b02f 100644 --- a/ports/boost-redis/vcpkg.json +++ b/ports/boost-redis/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-redis", "version": "1.84.0", + "port-version": 1, "description": "Boost redis module", "homepage": "https://github.com/boostorg/redis", "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" @@ -22,6 +27,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mp11", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-throw-exception", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-regex/b2-options.cmake b/ports/boost-regex/b2-options.cmake deleted file mode 100644 index fbaea00459..0000000000 --- a/ports/boost-regex/b2-options.cmake +++ /dev/null @@ -1,5 +0,0 @@ -if("icu" IN_LIST FEATURES) - set(B2_REQUIREMENTS "/user-config//icuuc /user-config//icudt /user-config//icuin BOOST_HAS_ICU=1") -else() - list(APPEND B2_OPTIONS --disable-icu) -endif() diff --git a/ports/boost-regex/compat.diff b/ports/boost-regex/compat.diff new file mode 100644 index 0000000000..cff8669e93 --- /dev/null +++ b/ports/boost-regex/compat.diff @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ccd422301..0959c5ab1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,17 +8,25 @@ cmake_minimum_required(VERSION 3.5...3.16) + + project(boost_regex VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) + +-add_library(boost_regex INTERFACE) ++set(regex_compat_sources ++ "src/posix_api.cpp" ++ "src/wide_posix_api.cpp" ++ "src/regex.cpp" ++ "src/regex_debug.cpp" ++ "src/static_mutex.cpp" ++) ++ ++add_library(boost_regex "${regex_compat_sources}") + add_library(Boost::regex ALIAS boost_regex) + +-target_include_directories(boost_regex INTERFACE include) ++target_include_directories(boost_regex PUBLIC include) + + option(BOOST_REGEX_STANDALONE "Boost.Regex: Enable Standalone Mode (i.e. no Boost dependencies)") + + if(NOT BOOST_REGEX_STANDALONE) + + target_link_libraries(boost_regex +- INTERFACE ++ PUBLIC + Boost::config + Boost::throw_exception + Boost::predef +@@ -34,9 +42,9 @@ else() + endif() + + find_package(ICU COMPONENTS data i18n uc QUIET) +-#option(BOOST_REGEX_ENABLE_ICU "Boost.Regex: enable ICU support" ${ICU_FOUND}) ++option(BOOST_REGEX_ENABLE_ICU "Boost.Regex: enable ICU support" ${ICU_FOUND}) + +-if(ICU_FOUND) ++if(BOOST_REGEX_ENABLE_ICU) + + add_library(boost_regex_icu INTERFACE) + add_library(Boost::regex_icu ALIAS boost_regex_icu) diff --git a/ports/boost-regex/features.cmake b/ports/boost-regex/features.cmake new file mode 100644 index 0000000000..d89a6bca0d --- /dev/null +++ b/ports/boost-regex/features.cmake @@ -0,0 +1,6 @@ +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + "icu" BOOST_REGEX_ENABLE_ICU +) \ No newline at end of file diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 3c8c552dde..32890ef377 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -6,12 +6,13 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 16103c3175cc9c2f15c3fa4a80324eaa130d44a66c85d7efc74f910670f9cfaadeef57d87b5ff1868d11cdb721ac739bd1a842401c2c88c54701f375e275a5af HEAD_REF master + PATCHES + compat.diff ) -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" +set(FEATURE_OPTIONS "") +include("${CMAKE_CURRENT_LIST_DIR}/features.cmake") +boost_configure_and_install( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 92dd4ea8fa..0e73220249 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-regex", "version": "1.84.0", + "port-version": 1, "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "license": "BSL-1.0", @@ -11,8 +12,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -32,12 +32,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" }, { @@ -63,14 +62,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ], "features": { diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index 2c078c4706..5684323ed9 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -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} +) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index f8ee098895..b58763efe0 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-safe-numerics", "version": "1.84.0", + "port-version": 1, "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "license": "BSL-1.0", "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-concept-check", "version>=": "1.84.0" @@ -18,6 +23,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -29,10 +38,6 @@ { "name": "boost-mp11", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index c48b56ac21..992b744220 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -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} +) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index 4f815d9d17..2cf9543e2e 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-scope-exit", "version": "1.84.0", + "port-version": 1, "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "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-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-preprocessor", "version>=": "1.84.0" @@ -25,10 +34,6 @@ { "name": "boost-typeof", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index d0017dab69..e95ec3326b 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -8,12 +8,8 @@ vcpkg_from_github( HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -string(REPLACE "check-target-builds ../../config/checks//std_wstreambuf" "check-target-builds ../config/checks//std_wstreambuf" _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}) +set(FEATURE_OPTIONS "") +boost_configure_and_install( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index 16053e15e2..d50954c711 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-serialization", "version": "1.84.0", + "port-version": 1, "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "license": "BSL-1.0", @@ -15,8 +16,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -35,6 +35,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -47,11 +51,6 @@ "name": "boost-iterator", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-move", "version>=": "1.84.0" @@ -107,14 +106,6 @@ { "name": "boost-variant2", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 1dee5ae3a3..59520e5d8f 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -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} +) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index 08117e50f3..0bd292d2e4 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-signals2", "version": "1.84.0", + "port-version": 1, "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-bind", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -26,6 +31,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -65,10 +74,6 @@ { "name": "boost-variant", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index defd8365a2..36838eb953 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -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} +) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index 77b2db760a..6d41e57fc6 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-smart-ptr", "version": "1.84.0", + "port-version": 1, "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "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-move", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index df2e73a222..c6f47854a8 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -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} +) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index 7f93810306..e86216048d 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-sort", "version": "1.84.0", + "port-version": 1, "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "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-range", "version>=": "1.84.0" @@ -25,10 +34,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 5aa0e7e4b0..8e7b87ab47 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -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} +) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index 6dfdec856e..c013310f13 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-spirit", "version": "1.84.0", + "port-version": 1, "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "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" @@ -38,6 +43,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -121,10 +130,6 @@ { "name": "boost-variant", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-stacktrace/features.cmake b/ports/boost-stacktrace/features.cmake new file mode 100644 index 0000000000..3491066c40 --- /dev/null +++ b/ports/boost-stacktrace/features.cmake @@ -0,0 +1,37 @@ + # BOOST_STACKTRACE_ENABLE_NOOP + + # When ON, builds the boost_stacktrace_noop library variant. Defaults to ON. + + # BOOST_STACKTRACE_ENABLE_BACKTRACE + + # When ON, builds the boost_stacktrace_backtrace library variant. Defaults to ON when libbacktrace is found, OFF otherwise. + + # BOOST_STACKTRACE_ENABLE_ADDR2LINE + + # When ON, builds the boost_stacktrace_addr2line library variant. Defaults to ON, except on Windows. + + # BOOST_STACKTRACE_ENABLE_BASIC + + # When ON, builds the boost_stacktrace_basic library variant. Defaults to ON. + + # BOOST_STACKTRACE_ENABLE_WINDBG + + # When ON, builds the boost_stacktrace_windbg library variant. Defaults to ON under Windows when WinDbg support is autodetected, otherwise OFF. + + # BOOST_STACKTRACE_ENABLE_WINDBG_CACHED + + # When ON, builds the boost_stacktrace_windbg_cached library variant. Defaults to ON under Windows when WinDbg support is autodetected and when thread_local is supported, otherwise OFF. + +list(APPEND FEATURE_OPTIONS + -DBOOST_STACKTRACE_ENABLE_BACKTRACE=OFF + ) + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS + -DBOOST_STACKTRACE_ENABLE_WINDBG=ON + ) +else() + list(APPEND FEATURE_OPTIONS + -DBOOST_STACKTRACE_ENABLE_WINDBG=OFF + ) +endif() \ No newline at end of file diff --git a/ports/boost-stacktrace/fix_config-check.diff b/ports/boost-stacktrace/fix_config-check.diff new file mode 100644 index 0000000000..25181d69df --- /dev/null +++ b/ports/boost-stacktrace/fix_config-check.diff @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1cb895570d..4638618d56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ include(CheckCXXSourceCompiles) + + function(stacktrace_check var source incs libs defs) + +- set(CMAKE_REQUIRED_INCLUDES "${incs}") ++ set(CMAKE_REQUIRED_INCLUDES "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + list(APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/build") + set(CMAKE_REQUIRED_LIBRARIES "${libs}") + set(CMAKE_REQUIRED_DEFINITIONS "${defs}") +@@ -69,7 +69,7 @@ if(WIN32 AND NOT CMAKE_CXX_PLATFORM_ID MATCHES "Cygwin") + endif() + + stacktrace_check(BOOST_STACKTRACE_HAS_WINDBG has_windbg.cpp "" "dbgeng;ole32" "") +-stacktrace_check(BOOST_STACKTRACE_HAS_WINDBG_CACHED has_windbg_cached.cpp "${CMAKE_CURRENT_SOURCE_DIR}/../config/include" "dbgeng;ole32" "") ++stacktrace_check(BOOST_STACKTRACE_HAS_WINDBG_CACHED has_windbg_cached.cpp "" "dbgeng;ole32" "") + + option(BOOST_STACKTRACE_ENABLE_NOOP "Boost.Stacktrace: build boost_stacktrace_noop" ON) + option(BOOST_STACKTRACE_ENABLE_BACKTRACE "Boost.Stacktrace: build boost_stacktrace_backtrace" ${BOOST_STACKTRACE_HAS_BACKTRACE}) diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 4654b41580..fc503a72fa 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 aa5c7ffd3ecc7d737399159aaa1dd675fe0da5621d4229a268c0413196e4f9172c151c8cc211df238d801dc6f7ac47efc8a453462c62c81c5c739b5c4b6c111f HEAD_REF master + PATCHES + fix_config-check.diff ) -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../config/checks/config" - "import ../config/checks/config" +set(FEATURE_OPTIONS "") +include("${CMAKE_CURRENT_LIST_DIR}/features.cmake") +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}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index 2e293e2ce4..386ea25e64 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stacktrace", "version": "1.84.0", + "port-version": 1, "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -25,25 +25,16 @@ "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-headers", "version>=": "1.84.0" }, { "name": "boost-predef", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-winapi", "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index c4200528df..2d2ab23bd3 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -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} +) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index e060836f02..e94fcfafc4 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-statechart", "version": "1.84.0", + "port-version": 1, "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "license": "BSL-1.0", @@ -14,6 +15,10 @@ "name": "boost-bind", "version>=": "1.84.0" }, + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -34,6 +39,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -53,10 +62,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index b67011a648..e68d1be55f 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -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} +) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index ba40413247..6958b9e6f9 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-assert", "version": "1.84.0", + "port-version": 1, "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_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" } ] diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index b4666abac4..c04d0158c7 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -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} +) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index 0f11294189..dfe0892fcc 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-string", "version": "1.84.0", + "port-version": 1, "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "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-static-assert", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 44d66ad647..56d1709ba4 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -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} +) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 4c7316c86f..bc48a644a8 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stl-interfaces", "version": "1.84.0", + "port-version": 1, "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "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-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-system/compat.diff b/ports/boost-system/compat.diff new file mode 100644 index 0000000000..24b2bea6d4 --- /dev/null +++ b/ports/boost-system/compat.diff @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1417f6a79..a25a1238d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,13 +6,13 @@ cmake_minimum_required(VERSION 3.5...3.20) + + project(boost_system VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) + +-add_library(boost_system INTERFACE) ++add_library(boost_system "src/error_code.cpp") + add_library(Boost::system ALIAS boost_system) + +-target_include_directories(boost_system INTERFACE include) ++target_include_directories(boost_system PUBLIC include) + + target_link_libraries(boost_system +- INTERFACE ++ PUBLIC + Boost::assert + Boost::config + Boost::throw_exception diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index 07d8234f69..74fe9c6e5a 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -8,9 +8,12 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 aa096fbef1f95bc97c82af87f0cb825b21b67d53ccec3fdeaef3e5a478b3f0865b0026ab7aadc3d7825a8bd345f980cb0bf4f9c698ac7403644cfce2a3fd1151 HEAD_REF master + PATCHES + compat.diff ) -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} +) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index b050a3094f..90eb22fb3d 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-system", "version": "1.84.0", + "port-version": 1, "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "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,8 +20,7 @@ "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-headers", "version>=": "1.84.0" }, { @@ -32,17 +31,9 @@ "name": "boost-variant2", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-winapi", "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 688a906cda..47310fc7bc 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -8,25 +8,21 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../predef/check/predef" - "import ../predef/check/predef" +set(FEATURE_OPTIONS "") +boost_configure_and_install( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") -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}) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*) - file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(COPY ${MONITOR_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(REMOVE ${MONITOR_LIBS}) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*) - file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") file(REMOVE ${DEBUG_MONITOR_LIBS}) endif() diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 1f28379b3e..3375b2218b 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-test", "version": "1.84.0", + "port-version": 1, "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "license": "BSL-1.0", @@ -20,8 +21,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -44,6 +44,10 @@ "name": "boost-function", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-io", "version>=": "1.84.0" @@ -52,11 +56,6 @@ "name": "boost-iterator", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -88,14 +87,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index bf79e9e78e..69c2adff46 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -8,10 +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} - BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +set(FEATURE_OPTIONS "") +boost_configure_and_install( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index 417a8b4b7f..74328dcb3a 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-thread", "version": "1.84.0", + "port-version": 1, "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "license": "BSL-1.0", @@ -19,12 +20,11 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-chrono", "version>=": "1.84.0" }, { - "name": "boost-chrono", + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -60,12 +60,11 @@ "version>=": "1.84.0" }, { - "name": "boost-io", + "name": "boost-headers", "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-io", "version>=": "1.84.0" }, { @@ -112,17 +111,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 } ] } diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index 1158e3e88c..b527f2b5b9 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -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} +) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index ceb73e6b51..7764765dc9 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-throw-exception", "version": "1.84.0", + "port-version": 1, "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "license": "BSL-1.0", @@ -10,12 +11,16 @@ "name": "boost-assert", "version>=": "1.84.0" }, + { + "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" } ] diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 998715322b..4683f96d5b 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -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} +) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index 88b9ce6897..e24bfc53bb 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -2,13 +2,13 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-timer", "version": "1.84.0", + "port-version": 1, "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "license": "BSL-1.0", "dependencies": [ { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -16,25 +16,16 @@ "version>=": "1.84.0" }, { - "name": "boost-io", + "name": "boost-headers", "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-io", "version>=": "1.84.0" }, { "name": "boost-predef", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 0e19e2e722..80b7b41e4d 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -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} +) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index 6b5ea48b41..4aada51b05 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tokenizer", "version": "1.84.0", + "port-version": 1, "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "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-iterator", "version>=": "1.84.0" @@ -29,10 +38,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 2bbb36dc1d..d63d31ad6a 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -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} +) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index 5d8935b6f2..610e3c2e45 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tti", "version": "1.84.0", + "port-version": 1, "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "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-function-types", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -25,10 +34,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index a5231c279c..5bb28d12fb 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -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} +) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 706d37507e..89a5260dc2 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tuple", "version": "1.84.0", + "port-version": 1, "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "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-static-assert", "version>=": "1.84.0" @@ -21,10 +30,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 331604b26a..bc67f390a1 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -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} +) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 38295b733d..97b119327d 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-erasure", "version": "1.84.0", + "port-version": 1, "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "license": "BSL-1.0", @@ -11,8 +12,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -28,12 +28,11 @@ "version>=": "1.84.0" }, { - "name": "boost-iterator", + "name": "boost-headers", "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-iterator", "version>=": "1.84.0" }, { @@ -68,17 +67,9 @@ "name": "boost-typeof", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-vmd", "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index dfbc751934..e13f72c0c7 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -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} +) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index ec53e07782..cb4c21b69e 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-index", "version": "1.84.0", + "port-version": 1, "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "license": "BSL-1.0", "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, { "name": "boost-config", "version>=": "1.84.0" @@ -19,11 +24,11 @@ "version>=": "1.84.0" }, { - "name": "boost-throw-exception", + "name": "boost-headers", "version>=": "1.84.0" }, { - "name": "boost-vcpkg-helpers", + "name": "boost-throw-exception", "version>=": "1.84.0" } ] diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 140e4e2863..f1cb09c112 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -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} +) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 58d0ef4afb..7893e35944 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -2,21 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-traits", "version": "1.84.0", + "port-version": 1, "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "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-static-assert", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index bba02d2337..7a8b29e75b 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -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} +) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index 00842ca167..4d35ce6306 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -2,16 +2,21 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-typeof", "version": "1.84.0", + "port-version": 1, "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "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" } ] diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 5cabef5109..43e9e3936c 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -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} +) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 21c3e4f678..471c0fb1e8 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -2,10 +2,19 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ublas", "version": "1.84.0", + "port-version": 1, "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "license": "BSL-1.0", "dependencies": [ + { + "name": "boost-cmake", + "version>=": "1.84.0" + }, + { + "name": "boost-compute", + "version>=": "1.84.0" + }, { "name": "boost-concept-check", "version>=": "1.84.0" @@ -18,6 +27,10 @@ "name": "boost-core", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-interval", "version>=": "1.84.0" @@ -53,10 +66,6 @@ { "name": "boost-typeof", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-uninstall/vcpkg-cmake-wrapper.cmake b/ports/boost-uninstall/vcpkg-cmake-wrapper.cmake index d3e5109b2a..3cf8dd14f7 100644 --- a/ports/boost-uninstall/vcpkg-cmake-wrapper.cmake +++ b/ports/boost-uninstall/vcpkg-cmake-wrapper.cmake @@ -1,11 +1,3 @@ -set(Boost_USE_STATIC_LIBS OFF) -set(Boost_USE_MULTITHREADED ON) -unset(Boost_USE_STATIC_RUNTIME) -set(Boost_NO_BOOST_CMAKE ON) -unset(Boost_USE_STATIC_RUNTIME CACHE) -if("${CMAKE_VS_PLATFORM_TOOLSET}" STREQUAL "v120") - set(Boost_COMPILER "-vc120") -else() - set(Boost_COMPILER "-vc140") -endif() +# Need to keep this file due to vcpkg.cmake otherwise injecting a different behavior. +set(Boost_NO_BOOST_CMAKE OFF) _find_package(${ARGS}) \ No newline at end of file diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index 78de757bb1..012e677598 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uninstall", "version": "1.84.0", + "port-version": 1, "description": "Internal vcpkg port used to uninstall Boost", "license": "MIT" } diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 8c7a40c139..da244b3b22 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -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} +) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 17e9eea7c7..fd9c61739f 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-units", "version": "1.84.0", + "port-version": 1, "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "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-integer", "version>=": "1.84.0" @@ -53,10 +62,6 @@ { "name": "boost-typeof", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index fda6c0cf2d..daa76c28e3 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -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} +) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 22e3f06197..be879c2b3c 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-unordered", "version": "1.84.0", + "port-version": 1, "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "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-mp11", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-throw-exception", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-url/portfile.cmake b/ports/boost-url/portfile.cmake index 91ff3675c2..1bbcda698f 100644 --- a/ports/boost-url/portfile.cmake +++ b/ports/boost-url/portfile.cmake @@ -8,12 +8,8 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_replace_string("${SOURCE_PATH}/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}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-url/vcpkg.json b/ports/boost-url/vcpkg.json index d7df747dba..0cebbf4d11 100644 --- a/ports/boost-url/vcpkg.json +++ b/ports/boost-url/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-url", "version": "1.84.0", + "port-version": 1, "description": "Boost url module", "homepage": "https://github.com/boostorg/url", "license": "BSL-1.0", @@ -15,8 +16,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -28,8 +28,7 @@ "version>=": "1.84.0" }, { - "name": "boost-modular-build-helper", - "host": true, + "name": "boost-headers", "version>=": "1.84.0" }, { @@ -59,14 +58,6 @@ { "name": "boost-variant2", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 5de2c1ba5a..c127777417 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -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} +) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index 4f65745942..992a219b97 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-utility", "version": "1.84.0", + "port-version": 1, "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "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-io", "version>=": "1.84.0" @@ -33,10 +42,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-uuid/opt-random.diff b/ports/boost-uuid/opt-random.diff new file mode 100644 index 0000000000..02f5910315 --- /dev/null +++ b/ports/boost-uuid/opt-random.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5130e59f8..a7b8cb5168 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ target_link_libraries(boost_uuid + Boost::move + Boost::numeric_conversion + Boost::predef +- Boost::random ++ $ + Boost::static_assert + Boost::throw_exception + Boost::tti diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index 58edf5c8a6..165477fba2 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -6,7 +6,12 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 f51ebc4b8e7cac35335d6f0910f8b840f85e6ad58f7b7b16bdb0094da9fe60fe56f2984fa94f576c1f6d7a75816f60f22fe842939c846a9080fd20cfd76af798 HEAD_REF master + PATCHES + opt-random.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} +) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 3e4ae229da..a3550a8af7 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uuid", "version": "1.84.0", + "port-version": 1, "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "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-io", "version>=": "1.84.0" @@ -59,10 +68,6 @@ "name": "boost-type-traits", "version>=": "1.84.0" }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, { "name": "boost-winapi", "version>=": "1.84.0" diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 417da7b418..9252989205 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -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} +) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index 52dca1916d..5e8248318e 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant", "version": "1.84.0", + "port-version": 1, "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "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" @@ -26,6 +31,10 @@ "name": "boost-detail", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -57,10 +66,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 197445435f..51a8df5faa 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -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} +) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index 49be662f1e..51a0c95ec0 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant2", "version": "1.84.0", + "port-version": 1, "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "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-mp11", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-vcpkg-helpers/LICENSE.txt b/ports/boost-vcpkg-helpers/LICENSE.txt deleted file mode 100644 index 2e4eac8264..0000000000 --- a/ports/boost-vcpkg-helpers/LICENSE.txt +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake deleted file mode 100644 index eaa4fde5fb..0000000000 --- a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake +++ /dev/null @@ -1,25 +0,0 @@ -function(boost_modular_headers) - cmake_parse_arguments(_bm "" "SOURCE_PATH" "" ${ARGN}) - - if(NOT DEFINED _bm_SOURCE_PATH) - message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_headers.") - endif() - - message(STATUS "Copying headers") - file( - COPY "${_bm_SOURCE_PATH}/include/boost" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" - ) - message(STATUS "Copying headers done") - - file(INSTALL - "${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - ) - - file(INSTALL - "${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost_LICENSE_1_0.txt" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright - ) -endfunction() diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake deleted file mode 100644 index b964f5bd88..0000000000 --- a/ports/boost-vcpkg-helpers/portfile.cmake +++ /dev/null @@ -1,16 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -vcpkg_download_distfile(LICENSE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${VERSION}/LICENSE_1_0.txt" - FILENAME "boost_LICENSE_1_0.txt" - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 -) - -file(INSTALL - "${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake" - "${CMAKE_CURRENT_LIST_DIR}/usage" - "${LICENSE}" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" -) - -vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt") diff --git a/ports/boost-vcpkg-helpers/usage b/ports/boost-vcpkg-helpers/usage deleted file mode 100644 index 89a0376dad..0000000000 --- a/ports/boost-vcpkg-helpers/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package boost is compatible with built-in CMake targets: - - find_package(Boost REQUIRED [COMPONENTS ...]) - target_link_libraries(main PRIVATE Boost::boost Boost:: Boost:: ...) diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json deleted file mode 100644 index 88ea0ace40..0000000000 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", - "name": "boost-vcpkg-helpers", - "version": "1.84.0", - "description": "Internal vcpkg port used to modularize Boost", - "license": "MIT", - "dependencies": [ - { - "name": "boost-uninstall", - "version>=": "1.84.0" - } - ] -} diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index d5b42bac5d..d9ce3e71ae 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -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} +) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index abb225eadd..bd933b9f5f 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -2,21 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-vmd", "version": "1.84.0", + "port-version": 1, "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "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" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index 5a95215fb9..4e16944804 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -8,12 +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}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index b5d4cf6122..7847ed66ba 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-wave", "version": "1.84.0", + "port-version": 1, "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "license": "BSL-1.0", @@ -12,8 +13,7 @@ "version>=": "1.84.0" }, { - "name": "boost-build", - "host": true, + "name": "boost-cmake", "version>=": "1.84.0" }, { @@ -37,6 +37,10 @@ "name": "boost-format", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-iterator", "version>=": "1.84.0" @@ -45,11 +49,6 @@ "name": "boost-lexical-cast", "version>=": "1.84.0" }, - { - "name": "boost-modular-build-helper", - "host": true, - "version>=": "1.84.0" - }, { "name": "boost-mpl", "version>=": "1.84.0" @@ -93,14 +92,6 @@ { "name": "boost-type-traits", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" - }, - { - "name": "vcpkg-cmake", - "host": true } ] } diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 28920f5297..a214b5dfeb 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -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} +) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index 96132bde77..9b3e638942 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -2,21 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-winapi", "version": "1.84.0", + "port-version": 1, "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "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-predef", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index af6825c619..6646980096 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -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} +) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index f70a8ce8c2..191c68c7aa 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-xpressive", "version": "1.84.0", + "port-version": 1, "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "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" @@ -30,6 +35,10 @@ "name": "boost-fusion", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-integer", "version>=": "1.84.0" @@ -93,10 +102,6 @@ { "name": "boost-utility", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index d847e350a7..6d75f5a0bd 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -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} +) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index 963bc313f5..49fe0d2915 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -2,10 +2,15 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-yap", "version": "1.84.0", + "port-version": 1, "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "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-hana", "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-index", "version>=": "1.84.0" - }, - { - "name": "boost-vcpkg-helpers", - "version>=": "1.84.0" } ] } diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index a02e5d8b8c..79495d7e89 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost", "version": "1.84.0", + "port-version": 1, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "license": "BSL-1.0", @@ -69,7 +70,7 @@ }, { "name": "boost-cobalt", - "platform": "!osx & !ios & !android", + "platform": "!osx & !ios & !android & !uwp", "version>=": "1.84.0" }, { @@ -211,12 +212,17 @@ }, { "name": "boost-graph", + "platform": "!uwp", "version>=": "1.84.0" }, { "name": "boost-hana", "version>=": "1.84.0" }, + { + "name": "boost-headers", + "version>=": "1.84.0" + }, { "name": "boost-heap", "version>=": "1.84.0" diff --git a/ports/vcpkg-boost/boost-install.cmake b/ports/vcpkg-boost/boost-install.cmake new file mode 100644 index 0000000000..4a0255a3a2 --- /dev/null +++ b/ports/vcpkg-boost/boost-install.cmake @@ -0,0 +1,97 @@ +include_guard(GLOBAL) + +function(boost_configure_and_install) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH" "OPTIONS") + + string(REPLACE "-" "_" boost_lib_name "${PORT}") + string(REPLACE "boost_" "" boost_lib_name "${boost_lib_name}") + set(boost_lib_name_config "${boost_lib_name}") + + set(headers_only OFF) + if(NOT EXISTS "${arg_SOURCE_PATH}/src") # regex|system|math are header only and only install libs due to compat + set(headers_only ON) + set(VCPKG_BUILD_TYPE release) + endif() + + set(boost_lib_path "libs/${boost_lib_name}") + if(boost_lib_name MATCHES "numeric") + string(REPLACE "numeric_" "numeric/" boost_lib_path "${boost_lib_path}") + string(REPLACE "numeric_" "numeric/" boost_lib_name "${boost_lib_name}") + elseif(PORT MATCHES "boost-(ublas|odeint|interval)") + set(boost_lib_name_config "numeric_${boost_lib_name}") + set(boost_lib_path "libs/numeric/${boost_lib_name}") + set(boost_lib_name "numeric/${boost_lib_name}") + endif() + + if(NOT EXISTS "${arg_SOURCE_PATH}/libs") # Check for --editable workflow + set(target_path "${arg_SOURCE_PATH}/${boost_lib_path}") + cmake_path(GET target_path PARENT_PATH parent_path) + file(RENAME "${arg_SOURCE_PATH}/" "${arg_SOURCE_PATH}.tmp/") + file(MAKE_DIRECTORY "${parent_path}") + file(RENAME "${arg_SOURCE_PATH}.tmp/" "${target_path}") + endif() + + file(WRITE "${arg_SOURCE_PATH}/CMakeLists.txt" " \ + cmake_minimum_required(VERSION 3.25) \n\ + \n\ + project(Boost VERSION ${VERSION} LANGUAGES CXX) \n\ + \n\ + set(BOOST_SUPERPROJECT_VERSION \${PROJECT_VERSION}) \n\ + set(BOOST_SUPERPROJECT_SOURCE_DIR \"\${PROJECT_SOURCE_DIR}\") \n\ + \n\ + list(APPEND CMAKE_MODULE_PATH \"${CURRENT_INSTALLED_DIR}/share/boost/cmake-build\") \n\ + \n\ + include(BoostRoot) \n\ + ") + + if("${PORT}" MATCHES "boost-(mpi|graph-parallel|property-map-parallel)") + list(APPEND arg_OPTIONS -DBOOST_ENABLE_MPI=ON) + endif() + + if("${PORT}" MATCHES "boost-(python|parameter-python)") + list(APPEND arg_OPTIONS -DBOOST_ENABLE_PYTHON=ON) + endif() + + vcpkg_cmake_configure( + SOURCE_PATH "${arg_SOURCE_PATH}" + OPTIONS + -DBOOST_INCLUDE_LIBRARIES=${boost_lib_name} + -DBOOST_RUNTIME_LINK=${VCPKG_CRT_LINKAGE} + "-DBOOST_INSTALL_INCLUDE_SUBDIR=" + "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=" + ${arg_OPTIONS} + ) + + vcpkg_cmake_install() + + file(GLOB cmake_paths "${CURRENT_PACKAGES_DIR}/lib/cmake/*" LIST_DIRECTORIES true) + file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/lib/cmake/*" LIST_DIRECTORIES false) + list(REMOVE_ITEM cmake_paths "${cmake_files}" "${CURRENT_PACKAGES_DIR}/lib/cmake/boost_${boost_lib_name_config}-${VERSION}") + foreach(config_path IN LISTS cmake_paths) + string(REPLACE "-${VERSION}" "" config_path "${config_path}") + string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/" "" config_name "${config_path}") + vcpkg_cmake_config_fixup(PACKAGE_NAME ${config_name} CONFIG_PATH lib/cmake/${config_name}-${VERSION} DO_NOT_DELETE_PARENT_CONFIG_PATH) + endforeach() + if(NOT PORT MATCHES "boost-(stacktrace|test)") + vcpkg_cmake_config_fixup(PACKAGE_NAME boost_${boost_lib_name_config} CONFIG_PATH lib/cmake/boost_${boost_lib_name_config}-${VERSION}) + else() + # These ports have no cmake config agreeing with the port name + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + endif() + + if(headers_only) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + ) + vcpkg_install_copyright(FILE_LIST "${CURRENT_INSTALLED_DIR}/share/boost-cmake/copyright") + + # Install port specific usage + string(REPLACE "-" "_" PORT_UNDERSCORE "${PORT}") + string(REPLACE "boost_" "" BOOST_PORT_NAME "${PORT_UNDERSCORE}") + if(PORT MATCHES "boost-(ublas|odeint|interval)") + string(PREPEND BOOST_PORT_NAME "numeric_") + endif() + configure_file("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-boost/usage.in" "${CURRENT_INSTALLED_DIR}/share/${PORT}/usage") +endfunction() diff --git a/ports/vcpkg-boost/portfile.cmake b/ports/vcpkg-boost/portfile.cmake new file mode 100644 index 0000000000..c603fd407b --- /dev/null +++ b/ports/vcpkg-boost/portfile.cmake @@ -0,0 +1,8 @@ +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/usage.in" + "${CMAKE_CURRENT_LIST_DIR}/boost-install.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt") +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/ports/vcpkg-boost/usage.in b/ports/vcpkg-boost/usage.in new file mode 100644 index 0000000000..929ed243b0 --- /dev/null +++ b/ports/vcpkg-boost/usage.in @@ -0,0 +1,9 @@ +The package @PORT@ is compatible with built-in CMake targets of FindBoost.cmake: + + find_package(Boost REQUIRED COMPONENTS @BOOST_PORT_NAME@) + target_link_libraries(main PRIVATE Boost::@BOOST_PORT_NAME@) + +or the generated cmake configs via: + + find_package(@PORT_UNDERSCORE@ REQUIRED CONFIG) + target_link_libraries(main PRIVATE Boost::@BOOST_PORT_NAME@) diff --git a/ports/vcpkg-boost/vcpkg-port-config.cmake b/ports/vcpkg-boost/vcpkg-port-config.cmake new file mode 100644 index 0000000000..990c112645 --- /dev/null +++ b/ports/vcpkg-boost/vcpkg-port-config.cmake @@ -0,0 +1,5 @@ +include_guard(GLOBAL) + +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/boost-install.cmake") diff --git a/ports/vcpkg-boost/vcpkg.json b/ports/vcpkg-boost/vcpkg.json new file mode 100644 index 0000000000..781a6c0013 --- /dev/null +++ b/ports/vcpkg-boost/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "vcpkg-boost", + "version-date": "2024-04-25", + "license": "MIT" +} diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 3db3805455..80b8f86fe8 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -2,6 +2,11 @@ param ( $libraries = @(), $version = "1.84.0", +# 1: boost-cmake/ref_sha.cmake needs manual updating +# 2: This script treats support statements as platform expressions. This is incorrect +# in a few cases e.g. boost-parameter-python not depending on boost-python for uwp since +# boost-python is not supported on uwp. Unless this script treats these cases correctly +# don't blindly stage/commit changes containing platform expressions in dependencies. $portsDir = $null ) @@ -25,9 +30,10 @@ else { $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1") # Clear this array when moving to a new boost version -$defaultPortVersion = 0 +$defaultPortVersion = 1 $portVersions = @{ - 'boost-modular-build-helper' = 3; + 'boost-cmake' = 0; + 'boost-headers' = 0; } function Get-PortVersion { @@ -92,10 +98,10 @@ $portData = @{ }; }; }; - "boost-cobalt" = @{ "supports" = "!osx & !ios & !android" }; + "boost-cobalt" = @{ "supports" = "!osx & !ios & !android & !uwp" }; "boost-context" = @{ "supports" = "!uwp & !emscripten" }; "boost-coroutine" = @{ "supports" = "!(arm & windows) & !uwp & !emscripten" }; - "boost-coroutine2" = @{ "supports" = "!emscripten" }; + "boost-graph-parallel" = @{ "dependencies" = @("mpi"); }; "boost-log" = @{ "supports" = "!uwp & !emscripten" }; "boost-locale" = @{ "dependencies" = @(@{ "name" = "libiconv"; "platform" = "!uwp & !windows & !mingw" }); @@ -118,10 +124,7 @@ $portData = @{ } } }; - "boost-graph-parallel" = @{ - "dependencies" = @("mpi"); - "supports" = "!uwp"; - }; + "boost-mysql" = @{ "dependencies" = @("openssl"); }; "boost-odeint" = @{ "features" = @{ "mpi" = @{ @@ -277,7 +280,6 @@ function GeneratePort() { param ( [string]$Library, [string]$Hash, - [bool]$NeedsBuild, $Dependencies = @() ) @@ -314,14 +316,13 @@ function GeneratePort() { " HEAD_REF master" ) [Array]$patches = Get-Item -Path "$portsDir/$portName/*.patch" - if ($null -eq $patches -or $patches.Count -eq 0) { - } - elseif ($patches.Count -eq 1) { - $portfileLines += @(" PATCHES $($patches.name)") + [Array]$diffs = Get-Item -Path "$portsDir/$portName/*.diff" + [Array]$allmods = $patches + $diffs + if ($null -eq $allmods -or $allmods.Count -eq 0) { } else { $portfileLines += @(" PATCHES") - foreach ($patch in $patches) { + foreach ($patch in $allmods) { $portfileLines += @(" $($patch.name)") } } @@ -334,42 +335,20 @@ function GeneratePort() { $portfileLines += @(Get-Content "$scriptsDir/post-source-stubs/$Library.cmake") } - if ($NeedsBuild) { + $portfileLines += @( + "set(FEATURE_OPTIONS `"`")" + ) + if (Test-Path "$portsDir/$portName/features.cmake") { $portfileLines += @( - "include(`${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" + "include(`"`${CMAKE_CURRENT_LIST_DIR}/features.cmake`")" ) - # b2-options.cmake contains port-specific build options - if (Test-Path "$portsDir/$portName/b2-options.cmake") { - $portfileLines += @( - "boost_modular_build(" - " SOURCE_PATH `${SOURCE_PATH}" - " BOOST_CMAKE_FRAGMENT `"`${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake`"" - ")" - ) - } - elseif (Test-Path "$portsDir/$portName/b2-options.cmake.in") { - $portfileLines += @( - '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"' - ')' - ) - } - else { - $portfileLines += @( - "boost_modular_build(SOURCE_PATH `${SOURCE_PATH})" - ) - } } $portfileLines += @( - "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)" - "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})" + "boost_configure_and_install(" + " SOURCE_PATH `"`${SOURCE_PATH}`"" + " OPTIONS `${FEATURE_OPTIONS}" + ")" ) if (Test-Path "$scriptsDir/post-build-stubs/$Library.cmake") { @@ -411,8 +390,6 @@ $foundLibraries = Get-ChildItem $scriptsDir/boost/libs -directory | ForEach-Obje "odeint" "ublas" } - elseif ($_ -eq "headers") { - } else { $_ } @@ -588,13 +565,12 @@ foreach ($library in $libraries) { # Remove optional dependencies that are only used for tests or examples $deps = @($deps | Where-Object { -not ( - ($library -eq 'ublas' -and $_ -eq 'compute') -or # PR #29325 ($library -eq 'gil' -and $_ -eq 'filesystem') # PR #20575 ) }) # Add dependency to the config for all libraries except the config library itself - if ($library -ne 'config') { + if ($library -ne 'config' -and $library -ne 'headers') { # Note: CMake's built-in finder (FindBoost.cmake) looks for Boost header files (boost/version.h or boost/config.h) # and stores the result in the Boost_INCLUDE_DIR variable. The files boost/version.h or boost/config.h are owned by the config library. # Without these files, the Boost_INCLUDE_DIR variable will not be set and the Boost version will not be detected. @@ -603,23 +579,18 @@ foreach ($library in $libraries) { } $deps = @($deps | ForEach-Object { GeneratePortDependency $_ }) - $deps += @("boost-vcpkg-helpers") - $needsBuild = $false - if (((Test-Path $unpacked/build/Jamfile.v2) -or (Test-Path $unpacked/build/Jamfile)) -and $library -notmatch "function_types") { - $deps += @( - @{ name = "boost-build"; host = $True }, - @{ name = "boost-modular-build-helper"; host = $True }, - @{ name = "vcpkg-cmake"; host = $True } - ) - $needsBuild = $true + if ($library -ne 'cmake') { + $deps += @("boost-cmake") + if ($library -ne 'headers') { + $deps += @("boost-headers") + } } GeneratePort ` -Library $library ` -Hash $hash ` - -Dependencies $deps ` - -NeedsBuild $needsBuild + -Dependencies $deps $boostPortDependencies += @(GeneratePortDependency $library) } @@ -650,17 +621,11 @@ if ($updateServicePorts) { # Generate manifest files for boost-vcpkg-helpers GeneratePortManifest ` - -PortName "boost-vcpkg-helpers" ` - -Description "Internal vcpkg port used to modularize Boost" ` - -License "MIT" ` - -Dependencies @("boost-uninstall") + -PortName "boost-cmake" ` + -Description "Boost CMake support infrastructure" ` + -License "BSL-1.0" ` + -Dependencies @("boost-uninstall", @{ name = "vcpkg-boost"; host = $True }, @{ name = "vcpkg-cmake"; host = $True }, @{ name = "vcpkg-cmake-config"; host = $True }) - # Generate manifest files for boost-modular-build-helper - GeneratePortManifest ` - -PortName "boost-modular-build-helper" ` - -Description "Internal vcpkg port used to build Boost libraries" ` - -License "MIT" ` - -Dependencies @("boost-uninstall", @{ name = "vcpkg-cmake"; host = $True }, @{ name = "vcpkg-cmake-get-vars"; host = $True }) # Generate manifest files for boost-build GeneratePortManifest ` @@ -669,4 +634,5 @@ if ($updateServicePorts) { -Description "Boost.Build" ` -License "BSL-1.0" ` -Dependencies @("boost-uninstall") + } diff --git a/scripts/boost/post-build-stubs/atomic.cmake b/scripts/boost/post-build-stubs/atomic.cmake deleted file mode 100644 index 883c85bf29..0000000000 --- a/scripts/boost/post-build-stubs/atomic.cmake +++ /dev/null @@ -1,2 +0,0 @@ -# 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") \ No newline at end of file diff --git a/scripts/boost/post-build-stubs/cmake.cmake b/scripts/boost/post-build-stubs/cmake.cmake new file mode 100644 index 0000000000..832be6ad0b --- /dev/null +++ b/scripts/boost/post-build-stubs/cmake.cmake @@ -0,0 +1,2 @@ +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage.in" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/scripts/boost/post-build-stubs/config.cmake b/scripts/boost/post-build-stubs/config.cmake index 8954abd800..48300ff789 100644 --- a/scripts/boost/post-build-stubs/config.cmake +++ b/scripts/boost/post-build-stubs/config.cmake @@ -1,7 +1,7 @@ -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") +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") diff --git a/scripts/boost/post-build-stubs/predef.cmake b/scripts/boost/post-build-stubs/predef.cmake index 392d784548..3b4b98af42 100644 --- a/scripts/boost/post-build-stubs/predef.cmake +++ b/scripts/boost/post-build-stubs/predef.cmake @@ -1,2 +1,2 @@ -file(COPY ${SOURCE_PATH}/tools/check DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-predef) +file(COPY "${SOURCE_PATH}/libs/predef/tools/check" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-predef") diff --git a/scripts/boost/post-build-stubs/test.cmake b/scripts/boost/post-build-stubs/test.cmake index 3a7ff8a8ba..2891a9d892 100644 --- a/scripts/boost/post-build-stubs/test.cmake +++ b/scripts/boost/post-build-stubs/test.cmake @@ -1,13 +1,13 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*) - file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(COPY ${MONITOR_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(REMOVE ${MONITOR_LIBS}) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*) - file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") file(REMOVE ${DEBUG_MONITOR_LIBS}) endif() diff --git a/scripts/boost/post-source-stubs/atomic.cmake b/scripts/boost/post-source-stubs/atomic.cmake deleted file mode 100644 index 832fe85386..0000000000 --- a/scripts/boost/post-source-stubs/atomic.cmake +++ /dev/null @@ -1,5 +0,0 @@ -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") \ No newline at end of file diff --git a/scripts/boost/post-source-stubs/cobalt.cmake b/scripts/boost/post-source-stubs/cobalt.cmake deleted file mode 100644 index c3c289b68e..0000000000 --- a/scripts/boost/post-source-stubs/cobalt.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/context.cmake b/scripts/boost/post-source-stubs/context.cmake deleted file mode 100644 index 52703ec1e9..0000000000 --- a/scripts/boost/post-source-stubs/context.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/fiber.cmake b/scripts/boost/post-source-stubs/fiber.cmake deleted file mode 100644 index 52703ec1e9..0000000000 --- a/scripts/boost/post-source-stubs/fiber.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake deleted file mode 100644 index c3c289b68e..0000000000 --- a/scripts/boost/post-source-stubs/json.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/locale.cmake b/scripts/boost/post-source-stubs/locale.cmake deleted file mode 100644 index dd2c640977..0000000000 --- a/scripts/boost/post-source-stubs/locale.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import config : requires" - "import ../config/checks/config : requires" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/log.cmake b/scripts/boost/post-source-stubs/log.cmake deleted file mode 100644 index f0b1ff061d..0000000000 --- a/scripts/boost/post-source-stubs/log.cmake +++ /dev/null @@ -1,9 +0,0 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import config : requires" "import ../config/checks/config : requires" _contents "${_contents}") -string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" - "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" - "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/math.cmake b/scripts/boost/post-source-stubs/math.cmake deleted file mode 100644 index 52703ec1e9..0000000000 --- a/scripts/boost/post-source-stubs/math.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake deleted file mode 100644 index 52703ec1e9..0000000000 --- a/scripts/boost/post-source-stubs/nowide.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/serialization.cmake b/scripts/boost/post-source-stubs/serialization.cmake deleted file mode 100644 index ec3ae6f5bc..0000000000 --- a/scripts/boost/post-source-stubs/serialization.cmake +++ /dev/null @@ -1,5 +0,0 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -string(REPLACE "check-target-builds ../../config/checks//std_wstreambuf" "check-target-builds ../config/checks//std_wstreambuf" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/stacktrace.cmake b/scripts/boost/post-source-stubs/stacktrace.cmake deleted file mode 100644 index 52703ec1e9..0000000000 --- a/scripts/boost/post-source-stubs/stacktrace.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/test.cmake b/scripts/boost/post-source-stubs/test.cmake deleted file mode 100644 index 140230b8be..0000000000 --- a/scripts/boost/post-source-stubs/test.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../predef/check/predef" - "import ../predef/check/predef" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") diff --git a/scripts/boost/post-source-stubs/url.cmake b/scripts/boost/post-source-stubs/url.cmake deleted file mode 100644 index 916ff6f2ea..0000000000 --- a/scripts/boost/post-source-stubs/url.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/Jamfile" - "import ../../config/checks/config" - "import config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/wave.cmake b/scripts/boost/post-source-stubs/wave.cmake deleted file mode 100644 index 52703ec1e9..0000000000 --- a/scripts/boost/post-source-stubs/wave.cmake +++ /dev/null @@ -1,5 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" - "import ../../config/checks/config" - "import ../config/checks/config" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index 1664017889..b5cf6abc8d 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c86eb2ffff3ac4bf14765b247010f35a5dade89d", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "5cdf726ffdb94b1312ded97480dd8d532431d126", "version": "1.84.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 0a5ec17e2b..f5d262f4fd 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9326163f3bf53ee625fa3b3183dc740085d9c949", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "1649f898d6dd9c8904fab6a7c1194a5c30bdb274", "version": "1.84.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index 16a0e66ef9..f0bb36a015 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a492a368b76501283ed00e87cff092703e9efcdf", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "676ef901af2b5986c71fb85788ba0a08979bad8e", "version": "1.84.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index 6876891b57..4e7de9f28c 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f30a88370b19a4e515c65ad0361345bdcd4218b", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2f43ed76aaa6cda19c30e95260ad50cb779cf98c", "version": "1.84.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index 5d4cf28c60..f8dbc7a865 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "958ca3b702a421bfab7eeca019b4f0c068ed67fc", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "7feefc063119142cc2eaedfc11255fdfdaa2025a", "version": "1.84.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 3e6506349a..ff746cd32c 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e764cbc00a9d7c97dd27ed82146694433afb6a8", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "7a9e250345837a2083dea856b1f4c74c4d664226", "version": "1.84.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index 06678f4dd2..c394136b94 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9afa13b4b7930bf99e4d262254888d79f083eed", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "fe832ada2e45a096248738b11897f54498df72e2", "version": "1.84.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 923f27638f..9e0d4b1fbc 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50322445fbbcd27c101aca5848869c527237b8db", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "5bdd9000a8f91de7ab9d340670f5138c94d7456a", "version": "1.84.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index 38daabccaf..779e59bec3 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac4c6e568ba0f62a5fb9bf729de5b636145e1c11", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "d599f640fca933cace45c60f6b5967f4230c4f84", "version": "1.84.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index be80d63c7b..047b1e3ffc 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af410cf3f82eeaf8a6658b62e03b6a5496a0af27", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "4081838367ea27df0e58bb626e84c6637a5e0e97", "version": "1.84.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index d0be67a7e2..5fb967469f 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fe545ac57062447a0b78dc8192602bc97eb1fe9", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "91d9529e404f5ad80f0b021787c224a558ecc2b3", "version": "1.84.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index d653c2e2f6..5871af289e 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4571ed0cebb116ed898cab16fa3e91bc459f1da", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "5c28cd6fd3a92cac6eda977ec133bf611665c7c4", "version": "1.84.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 6fd7a2d3a4..ae2ffae162 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3018c02ffb8dabb1e732402bdec61efac660cdc2", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "b23026b68d2bb711b73afd419b917a67f98677ad", "version": "1.84.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index 0f1a3e4060..67377b60bb 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "604a8d6eb66a32ba5e233d50e3231196e181e3b3", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "50f3c519d696856ff1b096e8ac2428d737304d0d", "version": "1.84.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index dad7ae0ba7..75f313ec55 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "381c6b1335f287f9267b2029fe70dc6942fc38ef", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "8e71f32f08e2a8e74687c85beaa5d6aaa4753c03", "version": "1.84.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index 4e85ee3653..0e8d1c88ce 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02bbc81f2bb6d5758d87010d3189f293227315f4", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0653ffae64a58892f055ef0e8d9af237295f7420", "version": "1.84.0", diff --git a/versions/b-/boost-cmake.json b/versions/b-/boost-cmake.json new file mode 100644 index 0000000000..48ee1e7364 --- /dev/null +++ b/versions/b-/boost-cmake.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "227c08b0d3181b3c10c9b27d6a9f0577a8f0a41c", + "version": "1.84.0", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boost-cobalt.json b/versions/b-/boost-cobalt.json index 7455080f6e..8d0078fbc5 100644 --- a/versions/b-/boost-cobalt.json +++ b/versions/b-/boost-cobalt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23eb2f7dd921c76369a4a61fc44b45ecec144ed6", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "b2b3e30a1a036742bcfb22766083cc1a4c0ceefc", "version": "1.84.0", diff --git a/versions/b-/boost-compat.json b/versions/b-/boost-compat.json index cdd9eedcbe..83d63a2fe3 100644 --- a/versions/b-/boost-compat.json +++ b/versions/b-/boost-compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db6f9fb9814337e62dd7fee4c3e63c3c5a1395d1", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "669244fa16e98132cd0141aabbd78516ba206fee", "version": "1.84.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 0f54afb816..9688fa3bce 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48e42c012d8a461115929ab19754a91eae9afb12", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "b659e6ab02f5aa2ebfb395d9ba6e80b2c9497ad6", "version": "1.84.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index 23a1e5988d..8da56a73ef 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f27db79eb5445f864bf4dccd95d496aee1c0bf3", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "e30139272ac79c1dd19e49319e5c9f791a225106", "version": "1.84.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index f44c031b30..4496519c9c 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7f99270cf27840189f7ae63527a58d68da4e7b7", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "f1658ec6a2ab024a4d4c741ee471c0db4344238b", "version": "1.84.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 8810de09db..37e9c85859 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef049fd9ff833c531a72fed45a272bb1cc52082b", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "30ccc94aba0f43bf905a641c39e3cb991e882d30", "version": "1.84.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 07aacafa5f..fe1d3ca4f6 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f1ceeb7eb20da473c07c10cfbc04ec87eebf10c", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "72beb1a98959147c41efd1661e10c37827313511", "version": "1.84.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index d20578ec00..1bb00e697d 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edb632b789fcb0b5dde9f9d7f7b13524c788f855", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "ee15da00e28be69db05ea8b29e19b6a6fc6ca132", "version": "1.84.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 204a90d48b..65894166fa 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4aa1ed767cb232a6167687327320c0140249ba4", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2c3c5db88cb7118fcde973914702e885cf53005d", "version": "1.84.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index 77dbb55051..9ee613bcf4 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7841ad18dd8768d23a908f884928336134f7113f", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "e08e8686355f85e72f127468e9593970a3dc7d01", "version": "1.84.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index 8e2de85968..c9cae7ccd1 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "939ff01af6adbbbecedeb2eda1adc34e20bb180d", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "e3b83a29a2979a917316fece1572314a0e7b2c81", "version": "1.84.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index f71952984d..008d527a94 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "112b351e4ce2a7906fdd143a06d3e99d1fedc478", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "f2c5123bf4c682b7a729001e1e5d7b78c7839e13", "version": "1.84.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 5b0072ac92..80064ae335 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9017ab1c0fde091fbdf8dff47818e760d7fd56dd", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "9092a51e0f86979692442d98202d839240721e6d", "version": "1.84.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index c87a06baf4..c0fac69f2d 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f66e5f0d5758b0bfefacccc7a0a0837a17ce9da", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "b6c89a5afa462111f3180af3c843fbc11ed3fd63", "version": "1.84.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index 1586cbffa1..8aa1ab1403 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d533d34a8a7e7cbffc7a048192f1bccc3e22318", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "8cf4fa067f24591f4c30e6cf54f44284a421991c", "version": "1.84.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index 47d6f53a68..3f3458ae0f 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c5d6d76559beffb001712785eb9215f936477f8", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "7096b802ae31e2690189123f41f63d70d5fbfd39", "version": "1.84.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index 5883a2b2a6..9ad91c6825 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c3aa069449627e4f8d1174d2df0fd21488095fc", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "7946ff22e340ee7a7933de620506a49f0c02e14d", "version": "1.84.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json index a41a5beceb..7db9b67457 100644 --- a/versions/b-/boost-describe.json +++ b/versions/b-/boost-describe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2911a3ec80928d966b0918cafb8e0de9fb6542a", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "c6782cbba94dda30916f801d4b68160f7b6063fe", "version": "1.84.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index 5beaa49c88..f27a18ca43 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1db9209044b151a7a78015ea7376219a19bff5e4", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "cd5519c5cf4815126782e82cafcce472281ced51", "version": "1.84.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index e4ee72cce5..2bc19e5d6b 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "272d33ec62b49eb9cacfb34306ed4964dc6695ba", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "4ad1aef2db0b3f484236b4664e38e8eee0bdca5e", "version": "1.84.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index c489eddb36..f261a41c18 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e98b71a39b3e0d747e4cecb23b862e38633d4fa", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "9b8fa2fe1a46c7f77f890f83eb124e2f62d21594", "version": "1.84.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index bab5541452..7ee4d170cf 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0499f5566874994dab142cd4af76b2d2b8275b86", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "169cba73d600248a5fea41b768f150a0ab23a1c6", "version": "1.84.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 40ce98106a..9454b9991b 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d108a3d14f48bf9a58625bfbefb7b711d7407542", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "97298e7547c5c7b015c8a55f46428f50fb53753f", "version": "1.84.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index e0b1c96588..8f6b6c2279 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecbafe38747c24ddf32affec35e908212a52d737", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "8fa513e456d7d9a92feed2cdec9596d8e07e8055", "version": "1.84.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index edddf173b1..93d24e77f6 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dbe48ac5428fe414113ec3a3d9a80a852cfb4a5", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "a85785c880dc278413f4c9c30a64f21ca848335e", "version": "1.84.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index 576196aca7..f222df8905 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab3920f78e5a5f4b3e63f5b0bc1959e6507d54ad", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "dbb2cb540041ff638b5167c378d6dc17a434d23e", "version": "1.84.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index 9189d51bc0..f510cb5567 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ee0145c968e3527784fa7d427cac57a603b3315", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2e9fa5e50246a289f352f1cbdc225b35f228339e", "version": "1.84.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index 9863e96161..bd8e53fc90 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "514a2f986f4826932631082767976c26bfafdeb7", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "bca3fb74a1f4a9c93c6f223f91f20b905590fec6", "version": "1.84.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index 9fe6d2a17e..89828f7921 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63b92c39bea8b34d91ed946ccbb9fb86979c5fc3", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "ae386f84f582456bae7c4f304930bad8cb3c3a43", "version": "1.84.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 9f68e66dd2..183404c02e 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbb491314d064cb3ca01d483ce10b26b86b01881", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "8c317e18c45ba2eac464e2f8e1e179356183c063", "version": "1.84.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 425eb7e74b..2e7c666f7e 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76f22f7381a32363066817bf9139a91f2cb764b0", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "76acd323a71cab65354fd244a1b6cd5d38950b8c", "version": "1.84.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index 28d0a5b13f..80b746d6d4 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4156ff5a8c7aa5b2ed9d1a5d7a76c5b470ab3b53", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "108d3dffaa34eb6e0102031318f6f81dd4e6af18", "version": "1.84.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index 19aa8c7a48..86b9210475 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa1e090ea1ec177d0cddc4907f1605fbf00b69c9", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "9c52ecf6eca52c8bb966f602b037d2ea8df66ef4", "version": "1.84.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 0f67c55ff8..7b1b0e184a 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b2a070c57d749ab6044eff71c2413ef65a0a37d", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "60b79d49cc7db6de724ea225d18f4a3f5c087d2a", "version": "1.84.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index 7b9e775f69..c70fa1d113 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "946273b6d6938086d1978da56809e3fd09ffc3e0", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "186c9274336af104cdf417d254641ae280b84764", "version": "1.84.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index 5a88558a96..8fad6844ff 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d0e1bca7819582ce1312bae2c5e7ae1c9bc6a44", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "d88bd441d8170ad7029d932c97557f276cb283c2", "version": "1.84.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index 069b79744f..df5e7a71cb 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "740dcfb60fe096804fde86ce1a3208b40f59bf47", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "6fac64afc8b870205efaf625ed00cf2eaa196bfa", "version": "1.84.0", diff --git a/versions/b-/boost-headers.json b/versions/b-/boost-headers.json new file mode 100644 index 0000000000..3c9814e481 --- /dev/null +++ b/versions/b-/boost-headers.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "548632bdeb7c8faf005e0c1209d6532d6742a929", + "version": "1.84.0", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index e691ee702a..4f69db9bd9 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56d01434c55a6579e2d03d90f420c5c442be2416", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "6e142c237b9a50af6eea02bb60cb8e076b3cc017", "version": "1.84.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 3a007e2ff4..cdf911a392 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3061b64ac805691da30ae0b1393248818c9cf40", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "d638494a36a082a981187d2c559bf339160f1948", "version": "1.84.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index fdc2f76499..1813ee915f 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "210f2244ba63b3c0e8becdd27cae7bdfabee5155", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "dbc18283a5d5acaab16d2165fc3ea2c4501d6649", "version": "1.84.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index c5184ce211..2df138f487 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c719d28575e0a460a7fde2896b30fae2d87de90", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "90556ca7d9068087ce741aec8e268256176af6db", "version": "1.84.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 12f5ccf371..c9b7650533 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c73dd82231a499dabbdcc01dad4cedd2b91eb158", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "ebfef65ee52f5566976920e3cac7f451f66c7ced", "version": "1.84.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index bd9c8a24b2..327f9073e1 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a748d579b7821792423f650cee8ee09f4ea4abbd", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "54fee6877683ea31ecb7d9f4e3f62e65ad1f76fd", "version": "1.84.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index 0c298071f5..aa26ee0cfe 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3120be3f0eb4b20af3db635072fa8b6d9de5b120", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "52084af2ce6522507fc50f224eb944690263560d", "version": "1.84.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index d00508e8fa..34fa4d1eca 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93dd4bf5f8b7812bc7fd30f4705a804791719930", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "b5f197c773d23bb868ae6ccce4c28dc0b97997ac", "version": "1.84.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index 91a251c1dd..57de0c1ff2 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "664ff9de8b5e975247aee9236dbf20c528afcf75", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "dca15cab49b7b33ab58762315d107336d28b404e", "version": "1.84.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index f0fa5b85a9..12bc13c992 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30e9e2fc1dbf9251ba57453cbc64f211001bcd63", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "01c0a85616fd0d4f8529c0ffa48bd358833d9ea4", "version": "1.84.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index 3a73a0b86c..7935a3f466 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8585a34dae111e35fbe896cb155470280cda9485", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0d18698f7abe635814d1a4887b5b94157c5fe2b0", "version": "1.84.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index af29e3aebb..cf31516d50 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32556f291648944fd04a5375f7cc094b0aa38145", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "071f85fda05b2ea3fa45d6b1dee3070950074762", "version": "1.84.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index c02efa2ac4..3fbda0b80f 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4993b3be9d47828189557df71b63c3a938a8800b", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "43da545cb3f4c5f999a69afa8588efded1489161", "version": "1.84.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json index 177a154b12..1115609bab 100644 --- a/versions/b-/boost-lambda2.json +++ b/versions/b-/boost-lambda2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fedbc3e3176a0c1c7eeee4f306f69bf010d6d428", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "09bd21488a9a351da1a26d00dbd76f1da8f50a8a", "version": "1.84.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index f8e813dbfb..099057941b 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c92f0b748b310f18437cc0a4bbfd321506e1b4d", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "ef47c8ddb007015f138d7d2f6c1942f1859c6e54", "version": "1.84.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index c1bd40a233..502d21021c 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "930de66483bdef93b9a3ef583a5331b82aaba60c", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "270740ecb9a0bf6d8536fa654ef862fdfd706ad5", "version": "1.84.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index a6dce43edc..4bf2abc4c4 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9f4b970ebb2c78b863b5c4f5f668d1b6dc9d4c3", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "bbecd00568ae32f048bb6cb48355547c889fd361", "version": "1.84.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index 36db6e1606..720d729d1a 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c81839a63513ffcdb624809da14c82e0c6ee2373", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "890a580576001c650e84c6b92fd995a048317e3e", "version": "1.84.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index 228662c888..36503c9c56 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d2e48d196ecdb49f885e45efcda5d004a5a6765", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0d45e99b757eda86d272cc1142e9cc348296bd2e", "version": "1.84.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index aa9ca70b5c..a20ce21447 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be836a0f53fe07d1bba3bde715ddc3fa0be4a7b1", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "db4f5d820c44affa3f47654fb2396d88493968a0", "version": "1.84.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index f140418c4f..aca260a1c3 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74534328b7e5b519b4f225ff648953a612335242", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "17ac346b6e90c114fca29894244340845440e183", "version": "1.84.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index 0be17fe21c..f990c5a04f 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7263a17f36245a96c59ee70c3dbe1d65f3f6c05b", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "b6e62a61bbf90ebc1f36bfd01892b793476e1d9b", "version": "1.84.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index b62ba46655..c02f9820b4 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fc7202ce5ea6baabffd65042452c7bf35d63939", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "922b74624b73c61779da3d81acb8b99b98d25970", "version": "1.84.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index b5a8ebee16..2371df1233 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "710dbfde7e98703c2861104cfccfa8082f2535a7", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "1159c6a1d6b15517994acbd64c0407ce57161723", "version": "1.84.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index 6a5fb21800..8f9f2eef62 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0afc9ac9325acfd5f47e1e831acc11e070fae529", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "a26261cdb9cc5232b748066ee61799564c3d3be2", "version": "1.84.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index 8303bb36f5..0b90d3eb77 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86bdc188ac62888477dff1a2dd035cb7e5b53c6a", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "82cf05256f02b93cf70ccdc141ff467d1ba2e9a2", "version": "1.84.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index ca3b8c7f0b..e7cbd84464 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c61fd8f557bd7e47e8c1ebafcecae766e1bcf2f", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "48ec467749d6a874076f755bf8d5a131381b5c82", "version": "1.84.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 67cf10ef10..6235ef186d 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cdd3ff2bc5d29f61cd8ea27eb86fd0abbb1285d", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "4276a1ca74ca3c612b74540d12b9a09a0bfd9a29", "version": "1.84.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index f454073b6d..ea46ca35da 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3e8f8082a75264da806ad17e58b6dbda5ede7e6", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "462e009bd4e8e260a24f52b69b34d6a44bed2fbe", "version": "1.84.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index ead5a9131c..4ae24c9528 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94433831c65256b45f78d4579eabaa896254cf5f", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "4d1d3bfd05ed85d3ea3712df38f0a07864d53d56", "version": "1.84.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index 972916769c..a5deae0e0f 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d065617f9299d2065d826620fa84f19f55c511ab", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "4c868a1c871bf2be340548a13614ee761780ccd5", "version": "1.84.0", diff --git a/versions/b-/boost-mysql.json b/versions/b-/boost-mysql.json index c572d3bd93..c17f1e19eb 100644 --- a/versions/b-/boost-mysql.json +++ b/versions/b-/boost-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d0da58e8e662f760555df2a7547a01dd1481b77", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "445cb1123a3d51d6cefd5954fea6cf3d06f83351", "version": "1.84.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index d365e37393..a569e1c58c 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae23a2c639d65f74e2450032be88e341a60225e6", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "ba0821bedf1027ee9fe1e6e93543115ecd2f069a", "version": "1.84.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 3417d8f27d..ab21b4b849 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "045c7591a2476df39303ead2ec238a792b4b473b", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2c04732bf0a8b5a4025226e584091e3998e1b224", "version": "1.84.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index 63af38f02a..45356cdde4 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae5704875a4fdeaa0b0dc58b46e6ef38bac7cf65", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2fcbd140edeb2924fc474103591e7c2f93bee130", "version": "1.84.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index 092a5ae2e0..5ac6b1f94b 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0377a7ce5a333e3098608848f0c01b10690e517e", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "48bb7c9174d9321f4b41f787edc318581972437c", "version": "1.84.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index f450ac1e8e..4410ac8c94 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "812e7d15d1611dbadbeec432056d11a0369adb05", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "3c30498b367ff02b3edf49c4e2e726fb64258200", "version": "1.84.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index ac2d06e3fc..7f6cbc9669 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "943ba5710d0a688a0bc0f93a1decd3a89a1aa2d8", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "e226c53878059005c1a0f38be081c3bfef1f7483", "version": "1.84.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index fa17650501..e1d973df07 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ad342d896cd07b998ea1424d6d0b02e9158ab6e", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "675460856203c4e36b59035ce05148bf5d6c4103", "version": "1.84.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 186b653a95..a9c3b681b7 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e57ea66074c09d0b7aa008d9ab10af22264ecf89", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2ccc905349d8ac698ee9900b86e952d7ead3f1db", "version": "1.84.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 811226ffee..ae5a092319 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0f46aa05e769ca814db892ba73697b365758080", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0c29dec6a299097d811bc9b76439f2ad7afe9fb6", "version": "1.84.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index a0844b12e0..23abdce3b5 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "816b1b8a0e773ef1785b30cbbd296b7cce0e1f54", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "5eac8cdcf86fc0fc2753efa6acd11f23463e8069", "version": "1.84.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index 40ab64772b..433b0ec124 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e9ea99d0077644630e85831f6c46031e4a13d2c", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "f9f254f2317b0f98b79fba8239b81ef3c65a30bb", "version": "1.84.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index 0f9dc3da76..4dd62a075c 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8479133b80578d0807fd99d0091aef695dfa4aef", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "359af8d863109dc52bf2a7f7de75bfc5cc912b6b", "version": "1.84.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index 22d8a92e7b..a7f6d64eba 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f14b394298998147f82b8aa97b956e5cf8afc77", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "087c63189a60b36df9891096809a9cd3393c914f", "version": "1.84.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index fc4fd74d0f..b26cc26a78 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbdd860d6ff10d998749499c64dd6566ad7da1e1", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "87a9dcc2d893cb4b0463fc054b761dd2fb446df4", "version": "1.84.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index 5f76a3d6d8..219f6c2f32 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddcd70e17925ea565402c86dae0a0ec013cb2850", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "b6a63d216875e9454cbfe56402b554ce08df2ddb", "version": "1.84.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index 4ab5df59b2..2e4aaece11 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b03ebc6de12cf174a894c7fae4ec636744cd8db1", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "775755221b75c1b8c48727ef5894fbd29db4478f", "version": "1.84.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json index 8c4cd82a62..83d6d42396 100644 --- a/versions/b-/boost-property-map-parallel.json +++ b/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27bf40ff1d75d08544c17f8d3b62593dfea3ac5c", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "96a4e6e0494da5c3c9bbfc537f21d64b976473f3", "version": "1.84.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index 4f17760f41..bdc579f469 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de491274620ff8f98013f3ee352fbe68c0681318", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "afa1c14b9ca8ba001f7dc5fbed165fb9f7e34a37", "version": "1.84.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index 9a475724a0..158d71ff0c 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffe114412626edbea4b371503b0d1f1b4972b888", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "fe19ef0bba9fdf21f3b3dd86ba9ce16142270082", "version": "1.84.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index 443ad41257..759445a56f 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d841762af7be07e4f01d2fe0776d8954c885d3a5", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0a54634df836af7950a3962c00de9b92d1d8351a", "version": "1.84.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index fba74c1c81..4f778b6b65 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7eddf6257da3e59d58651d1f37cc50ae79c011a", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "c0559a42951f7af1dab2fe477fb4cd63434ddaec", "version": "1.84.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index 9f4c05307e..f7ba299148 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65bdb598319327fb628a0d71296309e7e817a565", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "43674e733eca3a97529383f6732a3dc2c1e2544b", "version": "1.84.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 1344362d47..446cac15cc 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c8e17cf3f58afb929799e3b0b1b0d243e11d250", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "118696ac11e3fd3c266cf23fb88ed0a1627de68a", "version": "1.84.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index a9e88826ef..0aee25e32b 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c984f70ced548078c3aac8720d5f343ecc506fc5", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "7e18eb4875eee251ddbac6ead758d4e20e1b1f71", "version": "1.84.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index fbeede30d6..1d0fcacd1e 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4582865e9735ef385ea182c4327414a6e7ad2be", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2c03982fc0e52976188f003f72055cac0e3b0295", "version": "1.84.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index 76405a7281..2296210469 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30dc6b5e022b400fbbc762c260df6b4d06a1e114", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "082d4cc51e82e8c352926eb2873e9abdf891732f", "version": "1.84.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index 3f40294ea4..a3c4119595 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7aac20769225a319d7e69a5faba4e852a2d5f2e", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "8824769e6c009d6bf3b750c3a7914ba0476ef476", "version": "1.84.0", diff --git a/versions/b-/boost-redis.json b/versions/b-/boost-redis.json index 7e60084582..3654650da1 100644 --- a/versions/b-/boost-redis.json +++ b/versions/b-/boost-redis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50ed86a755d3d86e8c836bf62bd26535af847e49", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "be30e78685a77344e2115c36b317c776951bb9db", "version": "1.84.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index c3c1cd88f9..cc69b1a086 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07225eb7106af6a87059566358f671c9b095a4be", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "79565c2c7713679611f25b158373a1063de42fb3", "version": "1.84.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 76c59c1f31..f7c605463a 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06d8aeb7854584ce490b87dcac6d301576c945fd", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "7b34b4b91f840fbd91f16568d9094ec592ef2bc7", "version": "1.84.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 8c0e297e6d..61cd10b4d5 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "451205ed4a1617b509ec9d3ef02e5e267a8ffe00", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "621d3782c24cfb1e35566b350a8b026975e09a69", "version": "1.84.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 1b5ab93df8..8f9df06a44 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f8f13fee874259b9466bac92fbf3f7c968f2fc7", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "1503200e82a30cc47c9b3b6bf93b4109eea195b9", "version": "1.84.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index bf86e75659..ae433522ae 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5b831c6c6f7b4e025f7f29a6b21678547fc64ac", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "455e1a1c7cb7c023f425c31af5d3577559167219", "version": "1.84.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 8d275a9d4d..c5d52ca5c9 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae0420a9b2b1ce87d0824891c68101ffc1931155", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "4d235b9c9f410296263cf6d1cbf598befae87dc0", "version": "1.84.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index edcb91731c..f2aef225e6 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4b1da7b23b706c0ee8782c230b0a24e81d85091", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "62b775c8967ce4347072c17881484188faf5871f", "version": "1.84.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index b24d02829c..69781548ce 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b38cff1d450f1bdd7b44f26dc8155ab02afe3aac", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2af169b76d74cf6612d702c3cb5df9fc51303592", "version": "1.84.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 70acfa70d3..87eea759c5 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc0dd3025ddedcd693d91de5e97cb942733c247a", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "e4bcf4968926d3320effea3f1e0389783fa6d073", "version": "1.84.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index d6c9eba735..559115a7d1 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89ebedc94a9e11801bd4474734e49e83bbcfc6e4", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "21398359f6a56d42c75929dca6a5fda68ffe219a", "version": "1.84.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 5d188756b2..86962af70f 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edc97487412ec39ce85761512aec6317c58b9246", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "c79455c647747893ea950dedb858fad16d0819c3", "version": "1.84.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index 11f2454381..797ac31232 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6af794cc7ac294457b1c451b0eebaed7634e8b51", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "d4713f1a2398b6e21a7d5906456621f5eb46156c", "version": "1.84.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index 950f13c7e7..2729f6ba94 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "094f8f820151097b11955f6646f8d80b81e6dc8f", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "593aabdb7f8997f9147068a5222eaa68d3642814", "version": "1.84.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 250f0c909c..d809744bbc 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22de59dcf232bd59517eaee5d7106eb70ad977e0", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "c87d6964da1b27c95fc19c5ddd44c2f20ba4524a", "version": "1.84.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index b677fea821..8fc2981906 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d2411459c1e795fd312e53ab4bac8cde347c821", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "28298078d066a4a0b3b27a0c3f9acadeb7e01260", "version": "1.84.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index 48ce12458b..6b30dfca9c 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a57109ed508a9af1fe915cfa2550d4b5a8b5daa7", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "f7aa0651df5b4e391357cfc58db1b87f11af97e5", "version": "1.84.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 5e74da99a5..b14eb55ae9 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c37eb6fc4bdc04f175d66e81625c3f48730426b1", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "f3c85344985a864fb5d2245f788197ad3c727ff4", "version": "1.84.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 08d2e9291a..18da20f31d 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ee744db56b3d3d69e1160a31664731788cbbc54", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "95a50501b5eba119f8732c2fc02ea00b926ec740", "version": "1.84.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index 76bdcc5433..9056e0fe22 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fc004668181ab032bdb19d173bf1505427b9e9c", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "f813c482e33e213480b75d69780c4d795769e581", "version": "1.84.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 23fa5c69d1..a8b69bf384 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5705dd4b6efc860b945194a2ae443bae1ab9304", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2a8f4cecd47d8c713d8efd3cebc2567f16ba2050", "version": "1.84.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index c9017b7968..dba75c7769 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a03e5b5e84f46eac669699ad918d9132e8c4c2ac", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "226ff3eec30fe4b68902e7bb3f36db6dc580faf6", "version": "1.84.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index f967751e4d..b9dfcfb714 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c82287a09c12722a2be497b0c60a870ad1e9b9e2", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "eaf1e9af3557cce341ffd8853e02c019f03dc7da", "version": "1.84.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 2799f275ff..6a173db909 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64fb00e20b9ebb60326785f86a5b2a80d6c4b680", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "2b9d415a252b453a95dac06c8f5d658e3f529bf2", "version": "1.84.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index b32fb296b5..ce96d62d3c 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d29b89e99156a05e0b61bfd94c88fb5837ff3f64", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "a4ddf58a08ee20266007e39a261fc556b5b6e0ce", "version": "1.84.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index bbbf8e5ec1..ca363169f4 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7244107c17f3fb02e811dc2b66bf27ff492161e6", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "f5a00c4b05c0b35835446dd44ff7777fae86fe52", "version": "1.84.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index 174c24eaa4..fb2cd9c877 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8f4be0a0ec13d499d53ef97499e4efe90c35df4", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "55aefb0337e99e5d51c9c859aa73e19a8bb2dbf7", "version": "1.84.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index 31883a80f2..1f47fa6685 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e18cb1c4106a6b478889dc0a2ee02dabe78436a", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "6ed88ee3e093c9419fb4fcbdc17904d15d377129", "version": "1.84.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index 38f746ff0f..2799d1a10e 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a005d75e0552a6b318b4e8608791cde3245689f0", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "9088c5fd6a2540312f4236ad82367122d5faead3", "version": "1.84.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index 079f9498e0..29f361d54c 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6702bba67fe3f89326128f4bb17e06c76c7a436a", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "77a20edb9c6e3efec862eb37310f410a95544a30", "version": "1.84.0", diff --git a/versions/b-/boost-url.json b/versions/b-/boost-url.json index ed254902e4..b2363c8292 100644 --- a/versions/b-/boost-url.json +++ b/versions/b-/boost-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73cb6ead7317a682b8fa4d1b1455d7d8bc4bbb4b", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0dc7321b2d28cd349ace799644efd4f471e8ce03", "version": "1.84.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index f9c72f558c..923f7033e0 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24ae0368f935dd71efb00fab653059af1301c904", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0ea45d787be2fc247a434638a832b85acd3c5e3b", "version": "1.84.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index 3920741503..a14cb9a81c 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0eb5fa810c7af6d6c12a8396d553d790e0cde932", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "1dd155b365ce1df4bb524d11672c4ad2b3b2b43c", "version": "1.84.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index f55e9815ff..2b96ceeeb6 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bb13700800f1bdc8f0e2aa3e51f2f2dd3bbea81", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "0fae6f2ad84c37a644b0f2902f653e16b26e65f6", "version": "1.84.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index 19c06c1465..03a1a55f85 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e7ba438cd3f9eaba42ca1bc73cbd93e2a1507b5", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "90849fda39c8a2201b80eac6b04dc32ab6ae2c73", "version": "1.84.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index 49dd595b1a..b483354738 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a483540a7cba2d137a7ca0dd5fc9bd23df8dbcfe", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "908151c9b7afd64cbaebd7d88d6121de0be81b7b", "version": "1.84.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index 23f9836af0..82f3522c7f 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7db4d1f3ac59d69ad2caf2190bf4d33ebf1ebfae", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "1ddcecc1cbfc5d699bbb99eb75577b237d070227", "version": "1.84.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index f226c6541a..830aa8b756 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62e6d1e35ce468e9bcc44cb0a18ce671cc0f6407", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "32f9d89e087c4a777e62688c75a643608e3f9f6e", "version": "1.84.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index c40ba5661c..75882ce2db 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f36a4de1599e2d90cf8d9c61a5d118b40324b816", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "44168cef786140f27bd0efd38d258a3894cea3c2", "version": "1.84.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 0509b82a46..622d829960 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03cc7d52ee392099e392f31d2f168d5fa9c2d23b", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "94c0722f970f8d44f1dafe2a2def5deceed9a99f", "version": "1.84.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 4b23165107..87fbff26b7 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd55bc5092333ea17a39599f5b25b3063bb6b497", + "version": "1.84.0", + "port-version": 1 + }, { "git-tree": "827b5b48531aaa3fa9293a6d344f829c6529776c", "version": "1.84.0", diff --git a/versions/baseline.json b/versions/baseline.json index 57ae2759fa..d1d97362b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -710,599 +710,603 @@ }, "boost": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-accumulators": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-algorithm": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-align": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-any": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-array": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-asio": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-assert": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-assign": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-atomic": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-beast": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-bimap": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-bind": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-build": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-callable-traits": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-chrono": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-circular-buffer": { + "baseline": "1.84.0", + "port-version": 1 + }, + "boost-cmake": { "baseline": "1.84.0", "port-version": 0 }, "boost-cobalt": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-compat": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-compatibility": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-compute": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-concept-check": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-config": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-container": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-container-hash": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-context": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-contract": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-conversion": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-convert": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-core": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-coroutine": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-coroutine2": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-crc": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-date-time": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-describe": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-detail": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-dll": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-dynamic-bitset": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-endian": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-exception": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-fiber": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-filesystem": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-flyweight": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-foreach": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-format": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-function": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-function-types": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-functional": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-fusion": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-geometry": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-gil": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-graph": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-graph-parallel": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-hana": { + "baseline": "1.84.0", + "port-version": 1 + }, + "boost-headers": { "baseline": "1.84.0", "port-version": 0 }, "boost-heap": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-histogram": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-hof": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-icl": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-integer": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-interprocess": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-interval": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-intrusive": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-io": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-iostreams": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-iterator": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-json": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-lambda": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-lambda2": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-leaf": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-lexical-cast": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-local-function": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-locale": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-lockfree": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-log": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-logic": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-math": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-metaparse": { "baseline": "1.84.0", - "port-version": 0 - }, - "boost-modular-build-helper": { - "baseline": "1.84.0", - "port-version": 3 + "port-version": 1 }, "boost-move": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-mp11": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-mpi": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-mpl": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-msm": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-multi-array": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-multi-index": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-multiprecision": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-mysql": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-nowide": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-numeric-conversion": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-odeint": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-optional": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-outcome": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-parameter": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-parameter-python": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-pfr": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-phoenix": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-poly-collection": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-polygon": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-pool": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-predef": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-preprocessor": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-process": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-program-options": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-property-map": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-property-map-parallel": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-property-tree": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-proto": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-ptr-container": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-python": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-qvm": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-random": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-range": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-ratio": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-rational": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-redis": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-regex": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-safe-numerics": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-scope-exit": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-serialization": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-signals2": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-smart-ptr": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-sort": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-spirit": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-stacktrace": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-statechart": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-static-assert": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-static-string": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-stl-interfaces": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-system": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-test": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-thread": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-throw-exception": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-timer": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-tokenizer": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-tti": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-tuple": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-type-erasure": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-type-index": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-type-traits": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-typeof": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-ublas": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-uninstall": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-units": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-unordered": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-url": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-utility": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-uuid": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-variant": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-variant2": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-vcpkg-helpers": { "baseline": "1.84.0", @@ -1310,23 +1314,23 @@ }, "boost-vmd": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-wave": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-winapi": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-xpressive": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boost-yap": { "baseline": "1.84.0", - "port-version": 0 + "port-version": 1 }, "boringssl": { "baseline": "2023-10-13", @@ -9028,6 +9032,10 @@ "baseline": "2022.02", "port-version": 0 }, + "vcpkg-boost": { + "baseline": "2024-04-25", + "port-version": 0 + }, "vcpkg-cmake": { "baseline": "2023-05-04", "port-version": 0 diff --git a/versions/v-/vcpkg-boost.json b/versions/v-/vcpkg-boost.json new file mode 100644 index 0000000000..07087c205b --- /dev/null +++ b/versions/v-/vcpkg-boost.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "885223b657578128c0556fe6b53cfec8cbf50e12", + "version-date": "2024-04-25", + "port-version": 0 + } + ] +}