[Boost] use cmake build (microsoft#32309)

~~arm64-windows: boost-context builds are blocked by a cmake bug (see https://gitlab.kitware.com/cmake/cmake/-/issues/24317)~~ closes microsoft#32274 closes Neumann-A/my-vcpkg-triplets#5 Questions: - [x] ~~Move cmake files to `share/cmake/<name>` ?~~ Not doing it because it is just using `vcpkg_cmake_config_fixup()` - [x] Fix weak dependencies (uwp|emscripten|android|arm)? - [x] Fix library names on !x64 (currently hardcoded to x64 or x86; failure in aricpp since it forces FindBoost module mode.) - [x] ~~Fix arm64-windows boost-context builds -> requires CMake (3.19.2?) update due to bug how the assembler is invoked.~~ (-> CI baseline for now) TODO: - [x] adjust generate ports script - [x] microsoft#37457 --------- Co-authored-by: Cheney-Wang <[email protected]>
BillyONeal · Apr 29, 2024 · bcf3d00 · bcf3d00
1 parent dcfbe90
commit bcf3d00
Show file tree

Hide file tree

Showing 536 changed files with 3,845 additions and 2,674 deletions.
diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-accumulators",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Boost accumulators module",
   "homepage": "https://github.com/boostorg/accumulators",
   "license": "BSL-1.0",
@@ -18,6 +19,10 @@
       "name": "boost-circular-buffer",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-concept-check",
       "version>=": "1.84.0"
@@ -34,6 +39,10 @@
       "name": "boost-fusion",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-headers",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-iterator",
       "version>=": "1.84.0"
@@ -85,10 +94,6 @@
     {
       "name": "boost-ublas",
       "version>=": "1.84.0"
-    },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-algorithm",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Boost algorithm module",
   "homepage": "https://github.com/boostorg/algorithm",
   "license": "BSL-1.0",
@@ -18,6 +19,10 @@
       "name": "boost-bind",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-concept-check",
       "version>=": "1.84.0"
@@ -38,6 +43,10 @@
       "name": "boost-function",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-headers",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-iterator",
       "version>=": "1.84.0"
@@ -73,10 +82,6 @@
     {
       "name": "boost-unordered",
       "version>=": "1.84.0"
-    },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-align",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Boost align module",
   "homepage": "https://github.com/boostorg/align",
   "license": "BSL-1.0",
@@ -10,6 +11,10 @@
       "name": "boost-assert",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.84.0"
@@ -19,11 +24,11 @@
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-static-assert",
+      "name": "boost-headers",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-static-assert",
       "version>=": "1.84.0"
     }
   ]

diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-any",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Boost any module",
   "homepage": "https://github.com/boostorg/any",
   "license": "BSL-1.0",
@@ -10,20 +11,24 @@
       "name": "boost-assert",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-throw-exception",
+      "name": "boost-headers",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-type-index",
+      "name": "boost-throw-exception",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-type-index",
       "version>=": "1.84.0"
     }
   ]

diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-array",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Boost array module",
   "homepage": "https://github.com/boostorg/array",
   "license": "BSL-1.0",
@@ -10,6 +11,10 @@
       "name": "boost-assert",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.84.0"
@@ -19,15 +24,15 @@
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-static-assert",
+      "name": "boost-headers",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-throw-exception",
+      "name": "boost-static-assert",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-throw-exception",
       "version>=": "1.84.0"
     }
   ]

diff --git a/ports/boost-asio/opt-dep.diff b/ports/boost-asio/opt-dep.diff
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2ad3c1de2f..c918c7707d 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -17,13 +17,21 @@ target_link_libraries(boost_asio
+     Boost::align
+     Boost::assert
+     Boost::config
+-    Boost::context
+-    Boost::coroutine
++    $<TARGET_NAME_IF_EXISTS:Boost::context>
++    $<TARGET_NAME_IF_EXISTS:Boost::coroutine>
+     Boost::date_time
+     Boost::system
+     Boost::throw_exception
+ )
+
++if(NOT TARGET Boost::context)
++  target_compile_definitions(boost_asio INTERFACE $<$<NOT:$<TARGET_EXISTS:Boost::context>>:BOOST_ASIO_DISABLE_BOOST_CONTEXT_FIBER>)
++endif()
++
++if(NOT TARGET Boost::coroutine)
++  target_compile_definitions(boost_asio INTERFACE $<$<NOT:$<TARGET_EXISTS:Boost::coroutine>>:BOOST_ASIO_DISABLE_BOOST_COROUTINE>)
++endif()
++
+ target_compile_features(boost_asio INTERFACE cxx_std_11)
+
+ if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
@@ -6,8 +6,13 @@ vcpkg_from_github(
     REF boost-${VERSION}
     SHA512 88d1d8d1bbea29149d9747ab9ccb99a7bfbd928f8ed1aff90adb6382fcefd32dc9687e6832f8ac21ddf918f0608623aa123d7943aa5f697a6b946fe2311e05f6
     HEAD_REF master
-    PATCHES windows_alloca_header.patch
+    PATCHES
+        windows_alloca_header.patch
+        opt-dep.diff
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-asio",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Boost asio module",
   "homepage": "https://github.com/boostorg/asio",
   "license": "BSL-1.0",
@@ -14,6 +15,10 @@
       "name": "boost-assert",
       "version>=": "1.84.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.84.0"
@@ -33,15 +38,15 @@
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-system",
+      "name": "boost-headers",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-throw-exception",
+      "name": "boost-system",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-throw-exception",
       "version>=": "1.84.0"
     }
   ],

diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json
@@ -2,16 +2,21 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-assert",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Boost assert module",
   "homepage": "https://github.com/boostorg/assert",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-cmake",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.84.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-headers",
       "version>=": "1.84.0"
     }
   ]

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