From e8eaf3f3cb29782c1ad0f5a9d823402c1ce592aa Mon Sep 17 00:00:00 2001 From: Joachim Reichel <43646584+jreichel-nvidia@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:26:01 +0100 Subject: [PATCH 1/4] [vcpkg-ci-mdl-sdk] Add test port. Add test port to prevent future regressions of mdl-sdk features, in particular for the openimageio feature, as it happened in #37489. --- .../vcpkg-ci-mdl-sdk/portfile.cmake | 1 + .../test_ports/vcpkg-ci-mdl-sdk/vcpkg.json | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake new file mode 100644 index 00000000000000..065116c276adcf --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json new file mode 100644 index 00000000000000..b4a0cd0c05c9ab --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "vcpkg-ci-mdl-sdk", + "version-string": "ci", + "description": "Port to force features of certain ports within CI", + "license": "BSD-3-Clause", + "supports": "!x86 & !(windows & (staticcrt | arm | uwp)) & !(osx & arm) & !android", + "dependencies": [ + { + "name": "mdl-sdk", + "default-features": false, + "features": [ + "dds", + "openimageio" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} From 95b7d695078a486c10143c43f1cb32a9167294d2 Mon Sep 17 00:00:00 2001 From: Joachim Reichel <43646584+jreichel-nvidia@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:29:17 +0100 Subject: [PATCH 2/4] Add "vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)" to mimic the port itself. --- scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake index 065116c276adcf..bffba70bb82283 100644 --- a/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake @@ -1 +1,3 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) From 0858af7809377890dc42f3c2df469a0b5b99220c Mon Sep 17 00:00:00 2001 From: Joachim Reichel <43646584+jreichel-nvidia@users.noreply.github.com> Date: Mon, 6 Jan 2025 14:07:13 +0100 Subject: [PATCH 3/4] Remove "vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)" again. Exclude "windows & static". --- scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake | 2 -- scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake index bffba70bb82283..065116c276adcf 100644 --- a/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake @@ -1,3 +1 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json index b4a0cd0c05c9ab..d5c5654fa5221b 100644 --- a/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json @@ -3,7 +3,7 @@ "version-string": "ci", "description": "Port to force features of certain ports within CI", "license": "BSD-3-Clause", - "supports": "!x86 & !(windows & (staticcrt | arm | uwp)) & !(osx & arm) & !android", + "supports": "!x86 & !(windows & (staticcrt | arm | uwp | static)) & !(osx & arm) & !android", "dependencies": [ { "name": "mdl-sdk", From 4f4a14b2088ca082d4b4d76fb2d451beb85cc8b2 Mon Sep 17 00:00:00 2001 From: Joachim Reichel <43646584+jreichel-nvidia@users.noreply.github.com> Date: Wed, 8 Jan 2025 09:38:57 +0100 Subject: [PATCH 4/4] Simplify supports clause to mention only the additional restriction "!(windows & static)". --- scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json index d5c5654fa5221b..4556dd2662403a 100644 --- a/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json @@ -3,7 +3,7 @@ "version-string": "ci", "description": "Port to force features of certain ports within CI", "license": "BSD-3-Clause", - "supports": "!x86 & !(windows & (staticcrt | arm | uwp | static)) & !(osx & arm) & !android", + "supports": "!(windows & static)", "dependencies": [ { "name": "mdl-sdk",