diff --git a/ports/seal/CONTROL b/ports/seal/CONTROL index 36f701e8a3d2e5..060d457b6e9791 100644 --- a/ports/seal/CONTROL +++ b/ports/seal/CONTROL @@ -1,7 +1,8 @@ Source: seal -Version: 3.6.0 +Version: 3.6.1 Homepage: https://github.com/microsoft/SEAL Description: Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library. +Supports: !windows | (windows & static) Default-Features: ms-gsl, zlib, zstd Feature: ms-gsl @@ -15,3 +16,7 @@ Description: Use zlib for compressed serialization Feature: zstd Build-Depends: zstd Description: Use zstd for compressed serialization + +Feature: no-throw-tran +Build-Depends: +Description: Do not throw when operating on transparent ciphertexts diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index 4b0fc342cd2b44..d3bae38565e96a 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,15 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF 3eea4353d4768c79899a67ca4d36bfc3005d5412 - SHA512 ee3d8926f4a26c8f67a9e79fe5da9883195d2e9f9fffa47bb9c3526150d1e0c179968af7222ca280574921feb3c45200da1ca4dc0b012b82aa57dbdef26dcc0a + REF d6040632780981f3ab61969025d333d394eb2aeb + SHA512 f93c636eb9f3dd4c3b626b126aeed669da506e1e17eba172f6d3193ff2561b4cb4fc19a30b46792afa04848f1f4d73e276cdc915b41ec64bc9ea6d02550af110 HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES ms-gsl SEAL_USE_MSGSL zlib SEAL_USE_ZLIB zstd SEAL_USE_ZSTD + + INVERTED_FEATURES + no-throw-tran SEAL_THROW_ON_TRANSPARENT_CIPHERTEXT ) vcpkg_configure_cmake( diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 2969209399cba4..f4fa8a64f8ef4e 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -529,6 +529,10 @@ function(x_vcpkg_install_local_dependencies) foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS) get_target_property(TARGETTYPE ${TARGET} TYPE) if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY") + # Install CODE|SCRIPT allow the use of generator expressions + if(POLICY CMP0087) + cmake_policy(SET CMP0087 NEW) + endif() install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") execute_process(COMMAND \"${_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$\" diff --git a/toolsrc/src/vcpkg-test/paragraph.cpp b/toolsrc/src/vcpkg-test/paragraph.cpp index 356ee88f8bba06..cb3f8e6207b502 100644 --- a/toolsrc/src/vcpkg-test/paragraph.cpp +++ b/toolsrc/src/vcpkg-test/paragraph.cpp @@ -60,6 +60,7 @@ TEST_CASE ("SourceParagraph construct invalid", "[paragraph]") }}); REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); m_pgh = test_parse_control_file({{ {"Source", "zlib"}, @@ -68,6 +69,7 @@ TEST_CASE ("SourceParagraph construct invalid", "[paragraph]") }}); REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); m_pgh = test_parse_control_file({ { @@ -81,6 +83,16 @@ TEST_CASE ("SourceParagraph construct invalid", "[paragraph]") }); REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); + + // invalid field`s name + m_pgh = test_parse_control_file({{ + {"Surce", "zlib"}, + {"Vursion", "1.2.8"}, + }}); + + REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); } TEST_CASE ("SourceParagraph construct maximum", "[paragraph]")