mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 20:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[botan] ask for amalgamation build on windows (#13936)

Browse Source 
* ask for amalgamation build on windows to avoid linker errors due to long command line

* bump port-version on botan

* made the amalgamation build user-selectable via feature-flags
This commit is contained in:
Joakim L. Gilje 2020-10-13 00:20:01 +02:00 committed by GitHub
parent 180ec7eb93
commit f6ce6eb403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/botan/CONTROL
View File

@ -1,4 +1,8 @@
Source: botan Source: botan
Version: 2.15.0 Version: 2.15.0
Port-Version: 1
Homepage: https://botan.randombit.net Homepage: https://botan.randombit.net
Description: A cryptography library written in C++11 Description: A cryptography library written in C++11
Feature: amalgamation
Description: Do an amalgamation build of the library

8
ports/botan/portfile.cmake
View File

@ -46,6 +46,10 @@ else()
message(FATAL_ERROR "Unsupported architecture") message(FATAL_ERROR "Unsupported architecture")
endif() endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
amalgamation BOTAN_AMALGAMATION
)
function(BOTAN_BUILD BOTAN_BUILD_TYPE) function(BOTAN_BUILD BOTAN_BUILD_TYPE)
if(BOTAN_BUILD_TYPE STREQUAL "dbg") if(BOTAN_BUILD_TYPE STREQUAL "dbg")
@ -77,6 +81,10 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX}) list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX})
endif() endif()
if("-DBOTAN_AMALGAMATION=ON" IN_LIST FEATURE_OPTIONS)
list(APPEND configure_arguments --amalgamation)
endif()
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments} COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"