[sdl3] Fix config fixup (microsoft#42206)

azure-sdk · Nov 19, 2024 · d14bd2b · d14bd2b
1 parent 84a143e
commit d14bd2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/ports/sdl3/portfile.cmake b/ports/sdl3/portfile.cmake
@@ -48,7 +48,13 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
+
+# Subject to https://github.com/libsdl-org/SDL/pull/11492
+set(config_path "share/${PORT}/SDL3")
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(config_path "share/${PORT}")
+endif()
+vcpkg_cmake_config_fixup(CONFIG_PATH "${config_path}")
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"

diff --git a/ports/sdl3/vcpkg.json b/ports/sdl3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdl3",
   "version": "3.1.6-preview",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
   "homepage": "https://www.libsdl.org",
   "license": "Zlib AND MIT AND Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8242,7 +8242,7 @@
     },
     "sdl3": {
       "baseline": "3.1.6-preview",
-      "port-version": 1
+      "port-version": 2
     },
     "seacas": {
       "baseline": "2022-11-22",

diff --git a/versions/s-/sdl3.json b/versions/s-/sdl3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "696763312883c589e3a9b07f42b7293de4dcf2b1",
+      "version": "3.1.6-preview",
+      "port-version": 2
+    },
     {
       "git-tree": "fc1dd65862da2cf2770e2540136da1f89b493cda",
       "version": "3.1.6-preview",