forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[boost] bugfix and new features after update to 1.77.0 (microsoft#20432)
* [scripts/boost] fix issue microsoft#20417 [boost-iostreams] replace explicit dependencies with default-features, allow to disable compression filters * add versions * [scripts/boost] update port version after microsoft#20421 * [boost-odeint] move boost-mpi dependency to the feature * add version * [boost-modular-build-helper] rework user-config generation * [boost-python] move python3 from explicit dependency to default feature * [boost-modular-build-helper] update version * add verions * [boost-modular-build-helper] fix empty flags * update version * Fix compilation on Emscripten / WebAssembly (microsoft#20551) * [opencv4,opencv3] Control exported protobuf dependency (microsoft#20550) * Control exported protobuf dependency * Update versions * Control exported protobuf dependency * Update versions * [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (microsoft#20422) * [OpenMVS] restore deprecated cmake scripts * [OpenMVS] fix references * switch back to vcpkg_cmake_* Co-authored-by: nicole mazzuca <[email protected]> * [libffi] Don't replace string in file that doesn't exist. (microsoft#20554) * Don't replace string in file that doesn't exist. * Update per bot. * Update per bot again. * Address comments. * [json-dto] Update to 0.2.14 (microsoft#20570) * json-dto updated to v.0.2.14. * json-dto-0.2.14 added to baseline. * Change deprecated commands. * Update baseline for fresh json-dto-0.2.14. * [sail] Update to 0.9.0-pre17 (microsoft#20562) * [sail] Update to 0.9.0-pre17 * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Update pre17 hash * [sail] vcpkg x-add-version --all --overwrite-version * [freexl] Update to 1.0.6 (microsoft#20520) * Reformat portfile * Minimize makefiles patch * Update to 1.0.6 * Fix uwp builds, remove skip from baseline * Install pc file for windows * Update versions Co-authored-by: Billy Robert O'Neal III <[email protected]> * [dartsim] Update to 6.11.0 (microsoft#20566) * Update dartsim * Use newer vcpkg functions * Update version number * Update ports/dartsim/portfile.cmake Co-authored-by: Robert Schumacher <[email protected]> * Update versions Co-authored-by: Robert Schumacher <[email protected]> * [scripts/boost] update Boost version in boost-modular-build.cmake to avoid manual changes * update version * [boost-modular-build-helper] fix USER_CONFIG_EXTRA_LINES variable name and rename generated files * update version * Resolve differences from rerunning generate-ports.ps1. Co-authored-by: Billy Robert O'Neal III <[email protected]> Co-authored-by: Tobias Markus <[email protected]> Co-authored-by: Kai Pastor <[email protected]> Co-authored-by: Stefano Sinigardi <[email protected]> Co-authored-by: nicole mazzuca <[email protected]> Co-authored-by: Lars Glud <[email protected]> Co-authored-by: eao197 <[email protected]> Co-authored-by: Dmitry Baryshev <[email protected]> Co-authored-by: Akash <[email protected]> Co-authored-by: Robert Schumacher <[email protected]>
- Loading branch information
11 people
authored
Oct 12, 2021
1 parent
e29e78d
commit f904f73
Showing
25 changed files
with
397 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,86 @@ | ||
| list(APPEND B2_OPTIONS | ||
| -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| ) | ||
|
|
||
| if(CMAKE_BUILD_TYPE STREQUAL "Release") | ||
| set(lib_suffix lib) | ||
| set(lib_path_suffix lib) | ||
| else() | ||
| set(lib_path_suffix debug/lib) | ||
| endif() | ||
|
|
||
| if("bzip2" IN_LIST FEATURES) | ||
| list(APPEND B2_OPTIONS | ||
| -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| ) | ||
| # Overwride debug library name | ||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| list(APPEND B2_OPTIONS | ||
| -sBZIP2_NAME=bz2d | ||
| ) | ||
| endif() | ||
| list(APPEND B2_OPTIONS | ||
| -sBZIP2_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" | ||
| ) | ||
| else() | ||
| list(APPEND B2_OPTIONS | ||
| -sNO_BZIP2=1 | ||
| ) | ||
| endif() | ||
|
|
||
| if("lzma" IN_LIST FEATURES) | ||
| list(APPEND B2_OPTIONS | ||
| -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| ) | ||
| # Overwride debug library name | ||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| list(APPEND B2_OPTIONS | ||
| -sLZMA_NAME=lzmad | ||
| ) | ||
| endif() | ||
| list(APPEND B2_OPTIONS | ||
| -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" | ||
| ) | ||
| else() | ||
| set(lib_suffix debug/lib) | ||
| if(WIN32) | ||
| set(ZLIB_NAME zlibd) | ||
| else() | ||
| set(ZLIB_NAME z) | ||
| list(APPEND B2_OPTIONS | ||
| -sNO_LZMA=1 | ||
| ) | ||
| endif() | ||
|
|
||
| if("zlib" IN_LIST FEATURES) | ||
| list(APPEND B2_OPTIONS | ||
| -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| ) | ||
| # Overwride debug library name | ||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| if(WIN32) | ||
| set(ZLIB_NAME zlibd) | ||
| else() | ||
| set(ZLIB_NAME z) | ||
| endif() | ||
| list(APPEND B2_OPTIONS | ||
| -sZLIB_NAME=${ZLIB_NAME} | ||
| ) | ||
| endif() | ||
| list(APPEND B2_OPTIONS | ||
| -sZLIB_NAME=${ZLIB_NAME} | ||
| -sBZIP2_NAME=bz2d | ||
| -sLZMA_NAME=lzmad | ||
| -sZSTD_BINARY=zstdd | ||
| -sZLIB_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" | ||
| ) | ||
| else() | ||
| list(APPEND B2_OPTIONS | ||
| -sNO_ZLIB=1 | ||
| ) | ||
| endif() | ||
|
|
||
| list(APPEND B2_OPTIONS | ||
| -sZLIB_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" | ||
| -sBZIP2_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" | ||
| -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" | ||
| -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" | ||
| ) | ||
| if("zstd" IN_LIST FEATURES) | ||
| list(APPEND B2_OPTIONS | ||
| -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" | ||
| ) | ||
| # Overwride debug library name | ||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| list(APPEND B2_OPTIONS | ||
| -sZSTD_NAME=zstdd | ||
| ) | ||
| endif() | ||
| list(APPEND B2_OPTIONS | ||
| -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" | ||
| ) | ||
| else() | ||
| list(APPEND B2_OPTIONS | ||
| -sNO_ZSTD=1 | ||
| ) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
ports/boost-modular-build-helper/Jamroot.jam → ...boost-modular-build-helper/Jamroot.jam.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.