diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index bbb9038c2062c9..6b32b5683a1230 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -1,25 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls - REF 0bafe4ecdc591f633303ad0d32f3f6c38d099802 #v2.2.0 - SHA512 56acb0085a4f653660166c11982934d7f8c8836db63339aaca700aabade2bf7cff8cba77f9f04a68bbc119b5b15800bf01ffb10628703fb2188f6e654d0e5f22 + REF 662d4f2a0238357ccc4d89cd14b1fa67d2597ff1 #v2.3.4 + SHA512 f022d025ae1d5ff624982ceb61ee88c5a42ee958afcff39fbc3e698030092b6667c3a685b66b7fd16ab7c3d3af1d44b773f761e2eefd7f026432b80176b6894b HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCHARLS_BUILD_TESTS=OFF -DCHARLS_BUILD_SAMPLES=OFF -DCHARLS_BUILD_FUZZ_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/charls) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/charls) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/charls/vcpkg.json b/ports/charls/vcpkg.json index 3f07ca3c2eba0e..805b20f15a8a0c 100644 --- a/ports/charls/vcpkg.json +++ b/ports/charls/vcpkg.json @@ -1,7 +1,17 @@ { "name": "charls", - "version-string": "2.2.0", - "port-version": 2, + "version": "2.3.4", "description": "CharLS, a C++ JPEG-LS library implementation.", - "homepage": "https://github.com/team-charls/charls" + "homepage": "https://github.com/team-charls/charls", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ec860f008e733e..7fc7bacf8647d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1325,8 +1325,8 @@ "port-version": 2 }, "charls": { - "baseline": "2.2.0", - "port-version": 2 + "baseline": "2.3.4", + "port-version": 0 }, "chartdir": { "baseline": "7.0.0", diff --git a/versions/c-/charls.json b/versions/c-/charls.json index e2f9510e0f455e..c2785ce7a87ca9 100644 --- a/versions/c-/charls.json +++ b/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6273d01bce3793f42709b833ac47ff0afe71a6", + "version": "2.3.4", + "port-version": 0 + }, { "git-tree": "215d96df3e02eb0bfaae991586f4b64fd03c6cf2", "version-string": "2.2.0",