diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index c1aa50ea14..5cb7618e58 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gknowles/dimcli - REF v7.1.0 - SHA512 3fad1c68e116c65df453a545fe9def6dc05941675900fd81728531d7638fc1814b82ee1f613ec451bc6c31702a3d5e31f275e605fe6bd62c61513ecd78a172cc + REF "v${VERSION}" + SHA512 2d475e80e91e10244fd4c7ffeefb1f9fc84a786e2e7885d42295850e7c2dddc6572ad09a610b65e19639da9adca6ac6b6b3e6038cfed803fc2c59ae3818b4281 HEAD_REF master ) @@ -22,9 +22,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # Remove includes from ${CMAKE_INSTALL_PREFIX}/debug file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dimcli" RENAME copyright) diff --git a/ports/dimcli/vcpkg.json b/ports/dimcli/vcpkg.json index 1176555886..0b25228b72 100644 --- a/ports/dimcli/vcpkg.json +++ b/ports/dimcli/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dimcli", - "version-semver": "7.1.0", + "version-semver": "7.2.0", "description": "C++ command line parser toolkit", "homepage": "https://github.com/gknowles/dimcli", "documentation": "https://gknowles.github.io/dimcli", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7e94dcc30f..c62ba356ef 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -259,11 +259,6 @@ dcmtk:arm-neon-android=fail dcmtk:arm64-android=fail dcmtk:x64-android=fail dcmtk:x64-uwp=fail -# VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the -# upstream build script of this port. -# See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 -dimcli:x64-windows-static-md=fail -dimcli:x64-windows-static=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip diff --git a/versions/baseline.json b/versions/baseline.json index fb2c8b961d..95a66d021b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2201,7 +2201,7 @@ "port-version": 11 }, "dimcli": { - "baseline": "7.1.0", + "baseline": "7.2.0", "port-version": 0 }, "directx-dxc": { diff --git a/versions/d-/dimcli.json b/versions/d-/dimcli.json index a487da44f3..77d353b623 100644 --- a/versions/d-/dimcli.json +++ b/versions/d-/dimcli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "665897c6cbc03ae66b434b6584ea61a3445271d2", + "version-semver": "7.2.0", + "port-version": 0 + }, { "git-tree": "0ed989d414e631f12c2296afaf7e91f3a267c10c", "version-semver": "7.1.0",