diff options
| author | Daniel <supsuper@gmail.com> | 2018-03-16 08:02:55 +0000 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-16 01:02:55 -0700 |
| commit | 7528c4d525419a418e8e0046f6650b833ad75fd7 (patch) | |
| tree | 98f28a5a94ded9472add023087cae8c31e1a1223 | |
| parent | 3a056235b85f34573903a7dc325d45e66549b6ff (diff) | |
| download | vcpkg-7528c4d525419a418e8e0046f6650b833ad75fd7.tar.gz vcpkg-7528c4d525419a418e8e0046f6650b833ad75fd7.zip | |
Fix boost build errors when vcpkg path has spaces (#3054)
* Fix boost build errors when vcpkg path has spaces
Add missing quotes in boost_serialization path
* [boost-modular-build-helper] Bump version due to change
* [boost-modular-build-helper] Quote mpi as well
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/Jamroot.jam | 4 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/user-config.jam | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index eb2257a01..d57815738 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper
-Version: 1
+Version: 2
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index e498483c3..1e3dce89c 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -129,8 +129,8 @@ if "@PORT@" != "boost-serialization" {
use-project /boost/serialization : . ;
- lib boost_serialization : : <file>@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_RELEASE_SUFFIX@ <variant>release ;
- lib boost_serialization : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_DEBUG_SUFFIX@ <variant>debug ;
+ lib boost_serialization : : <file>"@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_RELEASE_SUFFIX@" <variant>release ;
+ lib boost_serialization : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_DEBUG_SUFFIX@" <variant>debug ;
explicit boost_serialization ;
}
diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index e045d622b..bd3797283 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -28,8 +28,8 @@ if "@PORT@" = "boost-python" if "@PORT@" = "boost-mpi"
{
using mpi : :
- <library-path>@CURRENT_INSTALLED_DIR@/lib
- <include>@CURRENT_INSTALLED_DIR@/include
+ <library-path>"@CURRENT_INSTALLED_DIR@/lib"
+ <include>"@CURRENT_INSTALLED_DIR@/include"
<find-shared-library>msmpi ;
}
|