diff --git a/ports/sqlcipher/CMakeLists.txt b/ports/sqlcipher/CMakeLists.txt index 723868704c..b9e826aab8 100644 --- a/ports/sqlcipher/CMakeLists.txt +++ b/ports/sqlcipher/CMakeLists.txt @@ -46,7 +46,7 @@ if (UNIX AND NOT APPLE) target_link_libraries(sqlcipher PRIVATE m) endif() -target_link_libraries(sqlcipher PRIVATE OpenSSL::Crypto) +target_link_libraries(sqlcipher PRIVATE OpenSSL::SSL OpenSSL::Crypto) if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore") target_compile_definitions(sqlcipher PRIVATE -DSQLITE_OS_WINRT=1) diff --git a/ports/sqlcipher/sqlcipher-config.in.cmake b/ports/sqlcipher/sqlcipher-config.in.cmake index 308ea4715c..80d8a80336 100644 --- a/ports/sqlcipher/sqlcipher-config.in.cmake +++ b/ports/sqlcipher/sqlcipher-config.in.cmake @@ -1,6 +1,7 @@ +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) - include(CMakeFindDependencyMacro) find_dependency(Threads) endif() diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index b2c2a7c5bb..2692923246 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlcipher", "version": "4.6.1", - "port-version": 2, + "port-version": 3, "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", "license": null, diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 31b925e04f..63e60d4d03 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -534,8 +534,6 @@ libmysql:x86-windows=skip libnick:arm64-osx=fail # missing system-installed copy of sqlcipher libnick:x64-linux=fail # C++20 conformant compiler required libnick:x64-osx=fail # missing system-installed copy of sqlcipher -libnick:x64-windows-static-md=fail # Missing transitive dependency on sqlcipher, remove if issue is fixed -libnick:x64-windows-static=fail # Missing transitive dependency on sqlcipher, remove if issue is fixed libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail @@ -743,7 +741,6 @@ openmpi:arm-neon-android=fail openmpi:arm64-android=fail openmpi:x64-android=fail openmvg:arm64-windows-static-md=fail -openmvg:x64-linux=fail openmvs:arm64-windows-static-md=fail # MSVC is not supported openslide:x64-windows-release=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index e56a5bc703..8a6dabb617 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1297,8 +1297,6 @@ libnice-gst:x64-uwp = cascade libnick:arm64-osx = fail libnick:x64-linux = fail libnick:x64-osx = fail -libnick:x64-windows-static-md=fail # Missing transitive dependency on sqlcipher, remove if issue is fixed -libnick:x64-windows-static=fail # Missing transitive dependency on sqlcipher, remove if issue is fixed libodb-boost:x64-linux = cascade libodb-mysql:arm64-uwp = cascade libodb-mysql:x64-linux = cascade diff --git a/versions/baseline.json b/versions/baseline.json index 807c1e884c..2ca07c6057 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9086,7 +9086,7 @@ }, "sqlcipher": { "baseline": "4.6.1", - "port-version": 2 + "port-version": 3 }, "sqlgen": { "baseline": "0.1.0", diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json index c9a0d472d5..1e7a7f7043 100644 --- a/versions/s-/sqlcipher.json +++ b/versions/s-/sqlcipher.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62c2e7ecd62bc96f82478b6b9bb1961195dd6b9f", + "version": "4.6.1", + "port-version": 3 + }, { "git-tree": "a11bc0fb6f797eb895de7c8a2e44ae84d085db6d", "version": "4.6.1",