diff options
| author | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2018-02-17 12:54:43 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-17 03:54:43 -0800 |
| commit | 14ef8e2fd2b99fc591bd1f29300c64d9fc14d84d (patch) | |
| tree | c3282e47bf1133e8281b488d33b78adb4301cd0b /ports/boost-build | |
| parent | 463775e913b06a11bb5c2acbd597790e834def93 (diff) | |
| download | vcpkg-14ef8e2fd2b99fc591bd1f29300c64d9fc14d84d.tar.gz vcpkg-14ef8e2fd2b99fc591bd1f29300c64d9fc14d84d.zip | |
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
Diffstat (limited to 'ports/boost-build')
| -rw-r--r-- | ports/boost-build/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-build/Jamroot.jam | 9 | ||||
| -rw-r--r-- | ports/boost-build/user-config.jam | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index f74f24f5c..cf93bfa1e 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,3 +1,3 @@ Source: boost-build
-Version: 1.66.0-4
+Version: 1.66.0-5
Description: Boost.Build
diff --git a/ports/boost-build/Jamroot.jam b/ports/boost-build/Jamroot.jam index 84f82126d..6669b446e 100644 --- a/ports/boost-build/Jamroot.jam +++ b/ports/boost-build/Jamroot.jam @@ -125,6 +125,15 @@ if "@PORT@" != "boost-test" explicit boost_unit_test_framework ;
}
+if "@PORT@" != "boost-serialization"
+{
+ use-project /boost/serialization : . ;
+
+ lib boost_serialization : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_serialization-vc140-mt.lib <variant>release ;
+ lib boost_serialization : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_serialization-vc140-mt-gd.lib <variant>debug ;
+ explicit boost_serialization ;
+}
+
rule requires ( foo * )
{
}
diff --git a/ports/boost-build/user-config.jam b/ports/boost-build/user-config.jam index ab86c0c43..59cc160cc 100644 --- a/ports/boost-build/user-config.jam +++ b/ports/boost-build/user-config.jam @@ -11,6 +11,14 @@ if "@PORT@" = "boost-python" using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_DEBUG@" : <python-debugging>on ;
}
+if "@PORT@" = "boost-mpi"
+{
+ using mpi : :
+ <library-path>@CURRENT_INSTALLED_DIR@/lib
+ <include>@CURRENT_INSTALLED_DIR@/include
+ <find-shared-library>msmpi ;
+}
+
project user-config : ;
lib advapi32 ;
|