Fix building boost.mpi (#2684)

* Fix building boost.mpi

* [boost-*] Remove boost-mpi dependencies to avoid direct dependency on msmpi.

* [boost-build] Bump version with mpi changes

1 files changed, 12 insertions, 3 deletions

diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1
index c410cd6a0..8b79826e2 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 "python" -or $Name -eq "asio")

+    if ($Name -eq "python" -or $Name -eq "asio" -or $Name -eq "mpi")

     {

         $versionsuffix = "-1"

     }

@@ -301,7 +301,7 @@ foreach ($library in $libraries)
             -and `

             (($library -notmatch "detail") -or ($_ -notmatch "static_assert|integer|mpl|type_traits"))`

             -and `

-            (($library -notmatch "property_map") -or ($_ -notmatch "mpi"))`

+            ($_ -notmatch "mpi")`

             -and `

             (($library -notmatch "spirit") -or ($_ -notmatch "serialization"))`

             -and `

@@ -339,6 +339,10 @@ foreach ($library in $libraries)
         {

             $deps += @("openssl")

         }

+        elseif ($library -eq "mpi")

+        {

+            $deps += @("msmpi")

+        }

 

         Generate `

             -Name $library `

@@ -363,7 +367,8 @@ foreach ($library in $libraries)
 }

 

 # Generate master boost control file which depends on each individual library

-$boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-" }) -join ", "

+# mpi is excluded due to it having a dependency on msmpi

+$boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-" } | ? { $_ -notmatch "boost-mpi" }) -join ", "

 

 @(

     "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1"

@@ -371,6 +376,10 @@ $boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-"
     "Version: $version"

     "Description: Peer-reviewed portable C++ source libraries"

     "Build-Depends: $boostDependsList"

+    ""

+    "Feature: mpi"

+    "Description: Build with MPI support"

+    "Build-Depends: boost-mpi"

 ) | out-file -enc ascii $scriptsDir/../boost/CONTROL

 

 "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" | out-file -enc ascii $scriptsDir/../boost/portfile.cmake