diff options
| author | Kevin Lalumiere <klalumiere@coveo.com> | 2020-12-28 15:23:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 12:23:45 -0800 |
| commit | f0d8f382daf48c7b90e32d058d5b76c5b6f6a222 (patch) | |
| tree | b205834c301ef4d14f817456a1c3efb055ab2bb9 | |
| parent | 77c59a85721f49747ccb7c59453b94f056b24a76 (diff) | |
| download | vcpkg-f0d8f382daf48c7b90e32d058d5b76c5b6f6a222.tar.gz vcpkg-f0d8f382daf48c7b90e32d058d5b76c5b6f6a222.zip | |
Allow B2_OPTIONS_[DBG|REL] in BOOST_CMAKE_FRAGMENT (#15274)
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 1 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index ff13adf83..731ee7f63 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,3 +1,4 @@ Source: boost-modular-build-helper
Version: 1.75.0
+Port-Version: 1
Build-Depends: boost-uninstall
\ No newline at end of file diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index adcd68951..5bb07ba46 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -213,7 +213,7 @@ function(boost_modular_build) else()
list(APPEND B2_OPTIONS threadapi=pthread)
endif()
- set(B2_OPTIONS_DBG
+ list(APPEND B2_OPTIONS_DBG
-sZLIB_BINARY=zlibd
"-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
-sBZIP2_BINARY=bz2d
@@ -224,7 +224,7 @@ function(boost_modular_build) "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
)
- set(B2_OPTIONS_REL
+ list(APPEND B2_OPTIONS_REL
-sZLIB_BINARY=zlib
"-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"
-sBZIP2_BINARY=bz2
|