From 78ac1d0bb641619094772e942673094b14935e7f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 17 Jan 2018 22:08:48 -0800 Subject: [PATCH 1/3] [boost] Split boost-modular.cmake --- ports/boost-accumulators/portfile.cmake | 2 +- ports/boost-algorithm/portfile.cmake | 2 +- ports/boost-align/portfile.cmake | 2 +- ports/boost-any/portfile.cmake | 2 +- ports/boost-array/portfile.cmake | 2 +- ports/boost-asio/portfile.cmake | 2 +- ports/boost-assert/portfile.cmake | 2 +- ports/boost-assign/portfile.cmake | 2 +- ports/boost-atomic/portfile.cmake | 3 +- ports/boost-beast/portfile.cmake | 2 +- ports/boost-bimap/portfile.cmake | 2 +- ports/boost-bind/portfile.cmake | 2 +- ports/boost-build/CONTROL | 2 +- .../Jamroot.jam | 0 .../boost-modular-build.cmake} | 32 ++----------------- .../nothing.bat | 0 ports/boost-build/portfile.cmake | 11 +++++++ .../user-config.jam | 0 ports/boost-callable-traits/portfile.cmake | 2 +- ports/boost-chrono/portfile.cmake | 3 +- ports/boost-circular-buffer/portfile.cmake | 2 +- ports/boost-compatibility/portfile.cmake | 2 +- ports/boost-compute/portfile.cmake | 2 +- ports/boost-concept-check/portfile.cmake | 2 +- ports/boost-config/portfile.cmake | 2 +- ports/boost-container/portfile.cmake | 3 +- ports/boost-context/portfile.cmake | 3 +- ports/boost-conversion/portfile.cmake | 2 +- ports/boost-convert/portfile.cmake | 2 +- ports/boost-core/portfile.cmake | 2 +- ports/boost-coroutine/portfile.cmake | 3 +- ports/boost-coroutine2/portfile.cmake | 2 +- ports/boost-crc/portfile.cmake | 2 +- ports/boost-date-time/portfile.cmake | 3 +- ports/boost-detail/portfile.cmake | 2 +- ports/boost-disjoint-sets/portfile.cmake | 2 +- ports/boost-dll/portfile.cmake | 2 +- ports/boost-dynamic-bitset/portfile.cmake | 2 +- ports/boost-endian/portfile.cmake | 2 +- ports/boost-exception/portfile.cmake | 3 +- ports/boost-fiber/portfile.cmake | 3 +- ports/boost-filesystem/portfile.cmake | 3 +- ports/boost-flyweight/portfile.cmake | 2 +- ports/boost-foreach/portfile.cmake | 2 +- ports/boost-format/portfile.cmake | 2 +- ports/boost-function-types/portfile.cmake | 2 +- ports/boost-function/portfile.cmake | 2 +- ports/boost-functional/portfile.cmake | 2 +- ports/boost-fusion/portfile.cmake | 2 +- ports/boost-geometry/portfile.cmake | 2 +- ports/boost-gil/portfile.cmake | 2 +- ports/boost-graph-parallel/portfile.cmake | 3 +- ports/boost-graph/portfile.cmake | 3 +- ports/boost-hana/portfile.cmake | 2 +- ports/boost-heap/portfile.cmake | 2 +- ports/boost-icl/portfile.cmake | 2 +- ports/boost-integer/portfile.cmake | 2 +- ports/boost-interprocess/portfile.cmake | 2 +- ports/boost-interval/portfile.cmake | 2 +- ports/boost-intrusive/portfile.cmake | 2 +- ports/boost-io/portfile.cmake | 2 +- ports/boost-iostreams/portfile.cmake | 3 +- ports/boost-iterator/portfile.cmake | 2 +- ports/boost-lambda/portfile.cmake | 2 +- ports/boost-lexical-cast/portfile.cmake | 2 +- ports/boost-local-function/portfile.cmake | 2 +- ports/boost-locale/portfile.cmake | 3 +- ports/boost-lockfree/portfile.cmake | 2 +- ports/boost-log/portfile.cmake | 3 +- ports/boost-logic/portfile.cmake | 2 +- ports/boost-math/portfile.cmake | 3 +- ports/boost-metaparse/portfile.cmake | 2 +- ports/boost-move/portfile.cmake | 2 +- ports/boost-mp11/portfile.cmake | 2 +- ports/boost-mpi/portfile.cmake | 3 +- ports/boost-mpl/portfile.cmake | 2 +- ports/boost-msm/portfile.cmake | 2 +- ports/boost-multi-array/portfile.cmake | 2 +- ports/boost-multi-index/portfile.cmake | 2 +- ports/boost-multiprecision/portfile.cmake | 2 +- ports/boost-numeric-conversion/portfile.cmake | 2 +- ports/boost-odeint/portfile.cmake | 2 +- ports/boost-optional/portfile.cmake | 2 +- ports/boost-parameter/portfile.cmake | 2 +- ports/boost-phoenix/portfile.cmake | 2 +- ports/boost-poly-collection/portfile.cmake | 2 +- ports/boost-polygon/portfile.cmake | 2 +- ports/boost-pool/portfile.cmake | 2 +- ports/boost-predef/portfile.cmake | 2 +- ports/boost-preprocessor/portfile.cmake | 2 +- ports/boost-process/portfile.cmake | 2 +- ports/boost-program-options/portfile.cmake | 3 +- ports/boost-property-map/portfile.cmake | 2 +- ports/boost-property-tree/portfile.cmake | 2 +- ports/boost-proto/portfile.cmake | 2 +- ports/boost-ptr-container/portfile.cmake | 2 +- ports/boost-python/portfile.cmake | 3 +- ports/boost-qvm/portfile.cmake | 2 +- ports/boost-random/portfile.cmake | 3 +- ports/boost-range/portfile.cmake | 2 +- ports/boost-ratio/portfile.cmake | 2 +- ports/boost-rational/portfile.cmake | 2 +- ports/boost-regex/portfile.cmake | 3 +- ports/boost-scope-exit/portfile.cmake | 2 +- ports/boost-serialization/portfile.cmake | 3 +- ports/boost-signals/portfile.cmake | 3 +- ports/boost-signals2/portfile.cmake | 2 +- ports/boost-smart-ptr/portfile.cmake | 2 +- ports/boost-sort/portfile.cmake | 2 +- ports/boost-spirit/portfile.cmake | 2 +- ports/boost-stacktrace/portfile.cmake | 3 +- ports/boost-statechart/portfile.cmake | 2 +- ports/boost-static-assert/portfile.cmake | 2 +- ports/boost-system/portfile.cmake | 3 +- ports/boost-test/portfile.cmake | 3 +- ports/boost-thread/portfile.cmake | 3 +- ports/boost-throw-exception/portfile.cmake | 2 +- ports/boost-timer/portfile.cmake | 3 +- ports/boost-tokenizer/portfile.cmake | 2 +- ports/boost-tti/portfile.cmake | 2 +- ports/boost-tuple/portfile.cmake | 2 +- ports/boost-type-erasure/portfile.cmake | 3 +- ports/boost-type-index/portfile.cmake | 2 +- ports/boost-type-traits/portfile.cmake | 2 +- ports/boost-typeof/portfile.cmake | 2 +- ports/boost-ublas/portfile.cmake | 2 +- ports/boost-units/portfile.cmake | 2 +- ports/boost-unordered/portfile.cmake | 2 +- ports/boost-utility/portfile.cmake | 2 +- ports/boost-uuid/portfile.cmake | 2 +- ports/boost-variant/portfile.cmake | 2 +- ports/boost-vcpkg-helpers/CONTROL | 2 +- .../boost-modular-headers.cmake | 24 ++++++++++++++ ports/boost-vcpkg-helpers/generate-ports.ps1 | 12 +++++-- ports/boost-vcpkg-helpers/portfile.cmake | 6 +--- ports/boost-vmd/portfile.cmake | 2 +- ports/boost-wave/portfile.cmake | 3 +- ports/boost-winapi/portfile.cmake | 2 +- ports/boost-xpressive/portfile.cmake | 2 +- 139 files changed, 208 insertions(+), 168 deletions(-) rename ports/{boost-vcpkg-helpers => boost-build}/Jamroot.jam (100%) rename ports/{boost-vcpkg-helpers/boost-modular.cmake => boost-build/boost-modular-build.cmake} (89%) rename ports/{boost-vcpkg-helpers => boost-build}/nothing.bat (100%) rename ports/{boost-vcpkg-helpers => boost-build}/user-config.jam (100%) create mode 100644 ports/boost-vcpkg-helpers/boost-modular-headers.cmake diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index b550269689..9c13dcc525 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 2149ba0e01..2f6803405d 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index 481b663210..80a2a7ab74 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 76d723999c..47de0a4921 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 8affa0dff5..299bf6ff3b 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 4317b12d51..f513ae43c3 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 6112c47bff..cd0e8267f4 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 470e22cd9f..e2d0a7e200 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 650016d6f0..feb6711837 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 06312f4175..16d782d94f 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 313cd90751..eda19317a8 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 9cc1df5e72..8f6ee1cfbd 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index d034154d3f..79aab946ba 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,3 +1,3 @@ Source: boost-build -Version: 1.66.0 +Version: 1.66.0-1 Description: Boost.Build diff --git a/ports/boost-vcpkg-helpers/Jamroot.jam b/ports/boost-build/Jamroot.jam similarity index 100% rename from ports/boost-vcpkg-helpers/Jamroot.jam rename to ports/boost-build/Jamroot.jam diff --git a/ports/boost-vcpkg-helpers/boost-modular.cmake b/ports/boost-build/boost-modular-build.cmake similarity index 89% rename from ports/boost-vcpkg-helpers/boost-modular.cmake rename to ports/boost-build/boost-modular-build.cmake index 8e3ca378ba..e9062e7e3f 100644 --- a/ports/boost-vcpkg-helpers/boost-modular.cmake +++ b/ports/boost-build/boost-modular-build.cmake @@ -1,4 +1,3 @@ - function(boost_modular_build) cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS" "OPTIONS" ${ARGN}) @@ -21,7 +20,7 @@ function(boost_modular_build) list(APPEND _bm_OPTIONS windows-api=store) endif() - set(_bm_DIR ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers) + set(_bm_DIR ${CURRENT_INSTALLED_DIR}/share/boost-build) if(EXISTS "${_bm_SOURCE_PATH}/Jamfile.v2") file(REMOVE_RECURSE "${_bm_SOURCE_PATH}/Jamfile.v2") @@ -245,37 +244,12 @@ function(boost_modular_build) 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 "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME}) - if ("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${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}) + 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() endfunction() - -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 "Packaging headers") - - file( - COPY ${_bm_SOURCE_PATH}/include/boost - DESTINATION ${CURRENT_PACKAGES_DIR}/include - ) - - message(STATUS "Packaging headers done") - - vcpkg_download_distfile(ARCHIVE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.65.1/LICENSE_1_0.txt" - FILENAME "boost_LICENSE_1_0.txt" - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 - ) - - file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endfunction() diff --git a/ports/boost-vcpkg-helpers/nothing.bat b/ports/boost-build/nothing.bat similarity index 100% rename from ports/boost-vcpkg-helpers/nothing.bat rename to ports/boost-build/nothing.bat diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index dec41e37b4..9a02b061ef 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -52,3 +52,14 @@ vcpkg_execute_required_process( file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright) file(INSTALL ${BOOSTCPP_ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/boost-build RENAME boostcpp.jam) + + + +file( + COPY + ${CMAKE_CURRENT_LIST_DIR}/boost-modular-build.cmake + ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam + ${CMAKE_CURRENT_LIST_DIR}/nothing.bat + ${CMAKE_CURRENT_LIST_DIR}/user-config.jam + DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build +) diff --git a/ports/boost-vcpkg-helpers/user-config.jam b/ports/boost-build/user-config.jam similarity index 100% rename from ports/boost-vcpkg-helpers/user-config.jam rename to ports/boost-build/user-config.jam diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 4bc138320a..0a0a670b39 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 167414ebfa..d1cb98af14 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index ebb8be3d0d..85b46c0d4d 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index cd9464deb6..e59db2e844 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index fd8e2cd39b..2c70ac5ef4 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 0aa6908306..36d7bac9c0 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 7b1a023c11..21d1c40837 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,6 +10,7 @@ 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") diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 46aefd96d1..d2cc5c209f 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-context/portfile.cmake b/ports/boost-context/portfile.cmake index 0e5852bb65..b749a9d800 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index 25b0a5dfb8..00ce64df74 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 10adca8e9f..a3c10172a5 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 59cb63c780..70c989e164 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 2ba322498b..14c8dbe3bf 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 824403bbf3..19ad0fecca 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index b8d183cd21..435ec9ad52 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index fad0f01e9d..a171018c48 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 072f143611..eec646472e 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-disjoint-sets/portfile.cmake b/ports/boost-disjoint-sets/portfile.cmake index 1b0c9aba35..223339e952 100644 --- a/ports/boost-disjoint-sets/portfile.cmake +++ b/ports/boost-disjoint-sets/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index c387a6d7cc..063b979f5b 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 63928751aa..414f7b304c 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 14f19b0edc..911d909713 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index dd5d6540ec..eda3644a70 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,7 +10,9 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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(VCPKG_LIBRARY_LINKAGE static) diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index 0ea0edcc42..ef8751a535 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index e85cc096a6..5a964b7a11 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 858560aeba..25c0f65f50 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 9801f70535..21c6883189 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index a6c44bd27d..a80e1c7e69 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index 1b31906995..2a679a25ae 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index c0db0b55f8..decf00686c 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 503d0786f4..5de067de43 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index ab3b553ddf..3923f82bc3 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 9e30e8fc71..c2f1d20ab6 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index 8ce5cc5aac..deb977a208 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 022831655c..8d2fdb2eb4 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 84948ccad0..21670d6474 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index a46cfb28fd..05ce047aa3 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 636763954d..02a25bab9d 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index e442621fa4..1f6bac41b9 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 07dc91e20c..4afba50e8e 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 6e959ca2db..c106354999 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 0d0a88b8bb..9fe1901972 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index d562cd0741..2fc9fd32a2 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index fae7c9191b..0991872ff5 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index e49d4a579f..782a7cb40d 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index c20e9e29cf..365938407e 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index 315bf1ddf9..bb9d68c6f2 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 5187ead72f..b86e06415a 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 0c59a8db78..a4f3789339 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index b8126dce5a..9c1aa2ff48 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -17,6 +16,7 @@ else() set(BOOST_LOCALE_ICU off) endif() +include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -25,4 +25,5 @@ boost_modular_build( /boost/locale//boost_locale boost.locale.icu=${BOOST_LOCALE_ICU} ) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index 0f6cabeb8d..989729d14c 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index ecc8118d95..302fb786ab 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index 66df8aca67..08a578ccd3 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index f6e4eeccd3..2ad0b28e28 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 972f5bf523..22742179c8 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index 29f3a3ff7b..c340db6e38 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 3e39072a89..a350e333ef 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index 66c11c29aa..0ac40b4a6d 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 908524fb21..44fc12d938 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index fec66d3171..c16c3a9621 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 312c4bfdda..ead468c540 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index a2b157fa69..7b8f35afff 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 9fe2f040a5..43423e6c37 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index e90d9dba2e..c525b2e1f5 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 6ded9f5b29..5309f3663b 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index e3144433b0..af2b6641ca 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index a5d119c15b..871f7198b1 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 42281eba47..74e290f1e0 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index b0fbf602ad..7edccef508 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index f9390d9633..1244b3abb9 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 1f5b5dfc9c..2b70b4c247 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index ff0e9a9f15..289bc4988e 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 4b85735b4f..0a2a62ad4f 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 444196c4ea..3b5fac7cf8 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 61740c6cb3..2eb6086f1e 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index b5855bd8b6..6f6739aa98 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index fd98c349bd..8632df529d 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 50051cec1c..c6ba949a29 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 34a7e4cb4d..8191f2c411 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 3952279902..db55b3e7b7 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -16,5 +15,7 @@ file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python[0-9.]*") set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib") set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib") string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}") +include(${CURRENT_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-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 1ef911b155..b16d419d56 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index f95153971b..ec99fec55a 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-range/portfile.cmake b/ports/boost-range/portfile.cmake index 8769e1cdda..7b676d4310 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index cb781cc5e5..a39d80204d 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index c0ad277447..437d650fa5 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 2246e3df4a..58cd529cdd 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -17,5 +16,7 @@ else() set(REQUIREMENTS) endif() +include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH} REQUIREMENTS "${REQUIREMENTS}") +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 60358a9924..1c31b1002f 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 59276cfd34..2349283f21 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-signals/portfile.cmake b/ports/boost-signals/portfile.cmake index 03895d120b..a2453b0b5d 100644 --- a/ports/boost-signals/portfile.cmake +++ b/ports/boost-signals/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 9e83e65c4b..992a410c96 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index 5dbfc14733..de74fd25d9 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 9a13503f87..e5e63b33db 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index e9b239d699..0a5ebf5aa6 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 8f8c3afa1f..34c6e6d31f 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 8b8e2da991..61680bd2bd 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 7768973dda..2598280af0 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index c5ca8d0cc1..bc35d0d930 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-test/portfile.cmake b/ports/boost-test/portfile.cmake index 090542bc73..57d6b99d00 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,7 +10,9 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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}) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 307ae58b48..e1f0a0c2f7 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH} REQUIREMENTS "/boost/date_time//boost_date_time") +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index bdf47bac7e..c4e87087ef 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 28210aabe8..072b701a76 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 74834110be..4f4c066bf6 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 2151427be6..d263b75404 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index a020d5d1b5..2c4cfe5be3 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 7363cfd8ef..95c28afc6b 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index 5f5f7dc7da..ae292b7e51 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 3dbd823827..5a7fb6a790 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 177e6d8601..644b8e1219 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 173236e875..385810a3be 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 87dd4906d0..1180ec01bb 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index abd0a3c3ed..f90c8094ff 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 5cf3ceeed3..42c9d1fc7c 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index c6f2950a69..35b9c4c179 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 9ec22e174f..8e32a822de 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL index 3e29eb9f8b..42e02b3aae 100644 --- a/ports/boost-vcpkg-helpers/CONTROL +++ b/ports/boost-vcpkg-helpers/CONTROL @@ -1,3 +1,3 @@ Source: boost-vcpkg-helpers -Version: 3 +Version: 4 Description: a set of vcpkg-internal scripts used to modularize boost diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake new file mode 100644 index 0000000000..1a4b8574bc --- /dev/null +++ b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake @@ -0,0 +1,24 @@ +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 "Packaging headers") + + file( + COPY ${_bm_SOURCE_PATH}/include/boost + DESTINATION ${CURRENT_PACKAGES_DIR}/include + ) + + message(STATUS "Packaging headers done") + + vcpkg_download_distfile(ARCHIVE + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.65.1/LICENSE_1_0.txt" + FILENAME "boost_LICENSE_1_0.txt" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 + ) + + file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +endfunction() diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1 index 09dcbca72d..62cfe5cc24 100644 --- a/ports/boost-vcpkg-helpers/generate-ports.ps1 +++ b/ports/boost-vcpkg-helpers/generate-ports.ps1 @@ -22,7 +22,7 @@ function Generate() $sanitizedName = $name -replace "_","-" $versionsuffix = "" - if ($Name -eq "test") + if ($Name -eq "test" -or $Name -eq "python") { $versionsuffix = "-1" } @@ -59,7 +59,6 @@ function Generate() "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" "" "include(vcpkg_common_functions)" - "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)" "" "vcpkg_from_github(" " OUT_SOURCE_PATH SOURCE_PATH" @@ -93,6 +92,7 @@ function Generate() " set(BOOST_LOCALE_ICU off)" "endif()" "" + "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" "boost_modular_build(" " SOURCE_PATH `${SOURCE_PATH}" " OPTIONS" @@ -112,23 +112,29 @@ function Generate() " set(REQUIREMENTS)" "endif()" "" + "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"`${REQUIREMENTS}`")" ) } elseif ($Name -eq "thread") { $portfileLines += @( + "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"/boost/date_time//boost_date_time`")" ) } else { $portfileLines += @( + "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" "boost_modular_build(SOURCE_PATH `${SOURCE_PATH})" ) } } - $portfileLines += @("boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})") + $portfileLines += @( + "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)" + "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})" + ) if ($Name -eq "exception") { diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake index 3d31bd327d..32f501f246 100644 --- a/ports/boost-vcpkg-helpers/portfile.cmake +++ b/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,10 +1,6 @@ file( - COPY - ${CMAKE_CURRENT_LIST_DIR}/boost-modular.cmake - ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam - ${CMAKE_CURRENT_LIST_DIR}/nothing.bat - ${CMAKE_CURRENT_LIST_DIR}/user-config.jam + COPY ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-vcpkg-helpers ) diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 389ba79fd0..eab18ada30 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index a9c3ea2326..e335f6ba41 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,5 +10,7 @@ vcpkg_from_github( HEAD_REF master ) +include(${CURRENT_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-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index eb0b91b8f3..d788dea86c 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 3848d814c6..2eacea4417 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -1,7 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,4 +10,5 @@ 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}) From 9fe10062003053ce8e4033440e3fba206bffbeaa Mon Sep 17 00:00:00 2001 From: David Benson Date: Tue, 16 Jan 2018 14:26:13 -0700 Subject: [PATCH 2/3] Restore support for zlib and gzip in iostreams --- ports/boost-build/boost-modular-build.cmake | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/ports/boost-build/boost-modular-build.cmake b/ports/boost-build/boost-modular-build.cmake index e9062e7e3f..f0d43f1b3a 100644 --- a/ports/boost-build/boost-modular-build.cmake +++ b/ports/boost-build/boost-modular-build.cmake @@ -102,10 +102,25 @@ function(boost_modular_build) --ignore-site-config --hash -q - + -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include" + -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include" threadapi=win32 threading=multi ) + set(_bm_OPTIONS_DBG + -sZLIB_BINARY=zlibd + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" + -sBZIP2_BINARY=bz2d + -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" + ) + + set(_bm_OPTIONS_REL + -sZLIB_BINARY=zlib + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" + -sBZIP2_BINARY=bz2 + -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" + ) + # Add build type specific options if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") @@ -176,6 +191,7 @@ function(boost_modular_build) --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam ${_bm_OPTIONS} + ${_bm_OPTIONS_REL} variant=release debug-symbols=on WORKING_DIRECTORY ${_bm_SOURCE_PATH} @@ -193,6 +209,7 @@ function(boost_modular_build) --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam ${_bm_OPTIONS} + ${_bm_OPTIONS_DBG} variant=debug WORKING_DIRECTORY ${_bm_SOURCE_PATH} LOGNAME build-${TARGET_TRIPLET}-dbg From 1e95a2cd8a47a40284fed7bb4547a8bf639a237f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 17 Jan 2018 23:20:31 -0800 Subject: [PATCH 3/3] [boost-build] Bump version to include ZLIB/BZIP2 --- ports/boost-build/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index 79aab946ba..12af51a0f1 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,3 +1,3 @@ Source: boost-build -Version: 1.66.0-1 +Version: 1.66.0-2 Description: Boost.Build