diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index 55d0b01e446..b7564ab93af 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher - REF v4.5.1 - SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3 + REF v4.5.2 + SHA512 1de5b219392bb976631857e32b4523258fd660fedb558d478e536b7e10c711c72c7e7c9062e45bd8a5ceaecbc1fee717935d2357f6811c3ddf76702167f4601b HEAD_REF master ) @@ -38,14 +38,14 @@ message(STATUS "Pre-building ${TARGET_TRIPLET}") vcpkg_execute_required_process( COMMAND ${NMAKE} -f Makefile.msc /A /NOLOGO clean tcl ${NMAKE_OPTIONS} - WORKING_DIRECTORY ${SOURCE_PATH} + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME pre-build-${TARGET_TRIPLET} ) message(STATUS "Pre-building ${TARGET_TRIPLET} done") # The rest of the build process with the CMakeLists.txt is merely a copy of sqlite3 -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -55,30 +55,29 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tool SQLITE3_SKIP_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSQLITE3_SKIP_TOOLS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT} TARGET_PATH share/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT SQLITE3_SKIP_TOOLS AND EXISTS ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher${VCPKG_HOST_EXECUTABLE_SUFFIX}) +if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() configure_file( - ${CMAKE_CURRENT_LIST_DIR}/sqlcipher-config.in.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/sqlcipher-config.cmake + "${CMAKE_CURRENT_LIST_DIR}/sqlcipher-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/sqlcipher-config.cmake" @ONLY ) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index 2d67e51759d..4641301c704 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,12 +1,21 @@ { "name": "sqlcipher", - "version": "4.5.1", + "version": "4.5.2", "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, "supports": "windows & !uwp & !static", "dependencies": [ "openssl", - "tcl" + "tcl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "geopoly": { diff --git a/versions/baseline.json b/versions/baseline.json index d6d3c7cda47..73527d40035 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6837,7 +6837,7 @@ "port-version": 1 }, "sqlcipher": { - "baseline": "4.5.1", + "baseline": "4.5.2", "port-version": 0 }, "sqlite-modern-cpp": { diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json index 391a0ed1d56..44b5caf0e09 100644 --- a/versions/s-/sqlcipher.json +++ b/versions/s-/sqlcipher.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56c606b11bcc5de6e0a93cde32b9c876539d6df4", + "version": "4.5.2", + "port-version": 0 + }, { "git-tree": "3803a9648861130c25517c8b330c17d054fe6cd7", "version": "4.5.1",