From 1306c2f7e5388bbfeae0f179e9640e760aca0d27 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Fri, 6 Jan 2023 19:12:52 +0100
Subject: [PATCH] dist: fix cmake config scripts for distributables
---
.../pkg-support/cmake/sdl2_image-config.cmake | 73 -------------------
....cmake => sdl3_image-config-version.cmake} | 6 +-
.../pkg-support/cmake/sdl3_image-config.cmake | 73 +++++++++++++++++++
.../resources/CMake/sdl2_image-config.cmake | 61 ----------------
....cmake => sdl3_image-config-version.cmake} | 0
.../resources/CMake/sdl3_image-config.cmake | 61 ++++++++++++++++
.../cmake/sdl2_image-config-version.cmake | 19 -----
.../pkg-support/cmake/sdl2_image-config.cmake | 19 -----
.../cmake/sdl3_image-config-version.cmake | 19 +++++
.../pkg-support/cmake/sdl3_image-config.cmake | 19 +++++
10 files changed, 175 insertions(+), 175 deletions(-)
delete mode 100644 VisualC/pkg-support/cmake/sdl2_image-config.cmake
rename VisualC/pkg-support/cmake/{sdl2_image-config-version.cmake => sdl3_image-config-version.cmake} (91%)
create mode 100644 VisualC/pkg-support/cmake/sdl3_image-config.cmake
delete mode 100644 Xcode/pkg-support/resources/CMake/sdl2_image-config.cmake
rename Xcode/pkg-support/resources/CMake/{sdl2_image-config-version.cmake => sdl3_image-config-version.cmake} (100%)
create mode 100644 Xcode/pkg-support/resources/CMake/sdl3_image-config.cmake
delete mode 100644 mingw/pkg-support/cmake/sdl2_image-config-version.cmake
delete mode 100644 mingw/pkg-support/cmake/sdl2_image-config.cmake
create mode 100644 mingw/pkg-support/cmake/sdl3_image-config-version.cmake
create mode 100644 mingw/pkg-support/cmake/sdl3_image-config.cmake
diff --git a/VisualC/pkg-support/cmake/sdl2_image-config.cmake b/VisualC/pkg-support/cmake/sdl2_image-config.cmake
deleted file mode 100644
index 6859daa5..00000000
--- a/VisualC/pkg-support/cmake/sdl2_image-config.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-# SDL2_image CMake configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL2_image-devel-2.x.y-VC
-
-include(FeatureSummary)
-set_package_properties(SDL2_image PROPERTIES
- URL "https://www.libsdl.org/projects/SDL_image/"
- DESCRIPTION "SDL_image is an image file loading library"
-)
-
-cmake_minimum_required(VERSION 3.0)
-
-set(SDL2_image_FOUND TRUE)
-
-set(SDL2IMAGE_AVIF FALSE)
-set(SDL2IMAGE_BMP TRUE)
-set(SDL2IMAGE_GIF TRUE)
-set(SDL2IMAGE_JPG TRUE)
-set(SDL2IMAGE_JXL FALSE)
-set(SDL2IMAGE_LBM TRUE)
-set(SDL2IMAGE_PCX TRUE)
-set(SDL2IMAGE_PNG TRUE)
-set(SDL2IMAGE_PNM TRUE)
-set(SDL2IMAGE_QOI TRUE)
-set(SDL2IMAGE_SVG TRUE)
-set(SDL2IMAGE_TGA TRUE)
-set(SDL2IMAGE_TIF FALSE)
-set(SDL2IMAGE_XCF FALSE)
-set(SDL2IMAGE_XPM TRUE)
-set(SDL2IMAGE_XV TRUE)
-set(SDL2IMAGE_WEBP FALSE)
-
-set(SDL2IMAGE_JPG_SAVE FALSE)
-set(SDL2IMAGE_PNG_SAVE FALSE)
-
-set(SDL2IMAGE_VENDORED FALSE)
-
-set(SDL2IMAGE_BACKEND_IMAGEIO FALSE)
-set(SDL2IMAGE_BACKEND_STB TRUE)
-set(SDL2IMAGE_BACKEND_WIC FALSE)
-
-if(CMAKE_SIZEOF_VOID_P STREQUAL "4")
- set(_sdl_arch_subdir "x86")
-elseif(CMAKE_SIZEOF_VOID_P STREQUAL "8")
- set(_sdl_arch_subdir "x64")
-else()
- unset(_sdl_arch_subdir)
- set(SDL2_image_FOUND FALSE)
- return()
-endif()
-
-set(_sdl2image_incdir "${CMAKE_CURRENT_LIST_DIR}/../include")
-set(_sdl2image_library "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL2_image.lib")
-set(_sdl2image_dll "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL2_image.dll")
-
-# All targets are created, even when some might not be requested though COMPONENTS.
-# This is done for compatibility with CMake generated SDL2_image-target.cmake files.
-
-if(NOT TARGET SDL2_image::SDL2_image)
- add_library(SDL2_image::SDL2_image SHARED IMPORTED)
- set_target_properties(SDL2_image::SDL2_image
- PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${_sdl2image_incdir}"
- IMPORTED_IMPLIB "${_sdl2image_library}"
- IMPORTED_LOCATION "${_sdl2image_dll}"
- COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
- INTERFACE_SDL2_SHARED "ON"
- )
-endif()
-
-unset(_sdl_arch_subdir)
-unset(_sdl2image_incdir)
-unset(_sdl2image_library)
-unset(_sdl2image_dll)
diff --git a/VisualC/pkg-support/cmake/sdl2_image-config-version.cmake b/VisualC/pkg-support/cmake/sdl3_image-config-version.cmake
similarity index 91%
rename from VisualC/pkg-support/cmake/sdl2_image-config-version.cmake
rename to VisualC/pkg-support/cmake/sdl3_image-config-version.cmake
index 525d7714..8bea09a3 100644
--- a/VisualC/pkg-support/cmake/sdl2_image-config-version.cmake
+++ b/VisualC/pkg-support/cmake/sdl3_image-config-version.cmake
@@ -1,10 +1,10 @@
# based on the files generated by CMake's write_basic_package_version_file
-# SDL2_image CMake version configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL2_image-devel-2.x.y-VC
+# SDL3_image CMake version configuration file:
+# This file is meant to be placed in a cmake subfolder of SDL3_image-devel-3.x.y-VC
if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../include/SDL_image.h")
- message(AUTHOR_WARNING "Could not find SDL_image.h. This script is meant to be placed in a CMake subfolder of SDL2_image-devel-2.x.y-VC")
+ message(AUTHOR_WARNING "Could not find SDL_image.h. This script is meant to be placed in a CMake subfolder of SDL3_image-devel-3.x.y-VC")
return()
endif()
diff --git a/VisualC/pkg-support/cmake/sdl3_image-config.cmake b/VisualC/pkg-support/cmake/sdl3_image-config.cmake
new file mode 100644
index 00000000..366bd857
--- /dev/null
+++ b/VisualC/pkg-support/cmake/sdl3_image-config.cmake
@@ -0,0 +1,73 @@
+# SDL3_image CMake configuration file:
+# This file is meant to be placed in a cmake subfolder of SDL3_image-devel-3.x.y-VC
+
+include(FeatureSummary)
+set_package_properties(SDL3_image PROPERTIES
+ URL "https://www.libsdl.org/projects/SDL_image/"
+ DESCRIPTION "SDL_image is an image file loading library"
+)
+
+cmake_minimum_required(VERSION 3.0)
+
+set(SDL3_image_FOUND TRUE)
+
+set(SDL3IMAGE_AVIF FALSE)
+set(SDL3IMAGE_BMP TRUE)
+set(SDL3IMAGE_GIF TRUE)
+set(SDL3IMAGE_JPG TRUE)
+set(SDL3IMAGE_JXL FALSE)
+set(SDL3IMAGE_LBM TRUE)
+set(SDL3IMAGE_PCX TRUE)
+set(SDL3IMAGE_PNG TRUE)
+set(SDL3IMAGE_PNM TRUE)
+set(SDL3IMAGE_QOI TRUE)
+set(SDL3IMAGE_SVG TRUE)
+set(SDL3IMAGE_TGA TRUE)
+set(SDL3IMAGE_TIF FALSE)
+set(SDL3IMAGE_XCF FALSE)
+set(SDL3IMAGE_XPM TRUE)
+set(SDL3IMAGE_XV TRUE)
+set(SDL3IMAGE_WEBP FALSE)
+
+set(SDL3IMAGE_JPG_SAVE FALSE)
+set(SDL3IMAGE_PNG_SAVE FALSE)
+
+set(SDL3IMAGE_VENDORED FALSE)
+
+set(SDL3IMAGE_BACKEND_IMAGEIO FALSE)
+set(SDL3IMAGE_BACKEND_STB TRUE)
+set(SDL3IMAGE_BACKEND_WIC FALSE)
+
+if(CMAKE_SIZEOF_VOID_P STREQUAL "4")
+ set(_sdl_arch_subdir "x86")
+elseif(CMAKE_SIZEOF_VOID_P STREQUAL "8")
+ set(_sdl_arch_subdir "x64")
+else()
+ unset(_sdl_arch_subdir)
+ set(SDL3_image_FOUND FALSE)
+ return()
+endif()
+
+set(_sdl3image_incdir "${CMAKE_CURRENT_LIST_DIR}/../include")
+set(_sdl3image_library "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL3_image.lib")
+set(_sdl3image_dll "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL3_image.dll")
+
+# All targets are created, even when some might not be requested though COMPONENTS.
+# This is done for compatibility with CMake generated SDL3_image-target.cmake files.
+
+if(NOT TARGET SDL3_image::SDL3_image)
+ add_library(SDL3_image::SDL3_image SHARED IMPORTED)
+ set_target_properties(SDL3_image::SDL3_image
+ PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${_sdl3image_incdir}"
+ IMPORTED_IMPLIB "${_sdl3image_library}"
+ IMPORTED_LOCATION "${_sdl3image_dll}"
+ COMPATIBLE_INTERFACE_BOOL "SDL3_SHARED"
+ INTERFACE_SDL3_SHARED "ON"
+ )
+endif()
+
+unset(_sdl_arch_subdir)
+unset(_sdl3image_incdir)
+unset(_sdl3image_library)
+unset(_sdl3image_dll)
diff --git a/Xcode/pkg-support/resources/CMake/sdl2_image-config.cmake b/Xcode/pkg-support/resources/CMake/sdl2_image-config.cmake
deleted file mode 100644
index d69d54bb..00000000
--- a/Xcode/pkg-support/resources/CMake/sdl2_image-config.cmake
+++ /dev/null
@@ -1,61 +0,0 @@
-# SDL2_image CMake configuration file:
-# This file is meant to be placed in Resources/CMake of a SDL2_image framework
-
-# INTERFACE_LINK_OPTIONS needs CMake 3.12
-cmake_minimum_required(VERSION 3.12)
-
-include(FeatureSummary)
-set_package_properties(SDL2_image PROPERTIES
- URL "https://www.libsdl.org/projects/SDL_image/"
- DESCRIPTION "SDL_image is an image file loading library"
-)
-
-set(SDL2_image_FOUND TRUE)
-
-set(SDL2IMAGE_AVIF FALSE)
-set(SDL2IMAGE_BMP TRUE)
-set(SDL2IMAGE_GIF TRUE)
-set(SDL2IMAGE_JPG TRUE)
-set(SDL2IMAGE_JXL FALSE)
-set(SDL2IMAGE_LBM TRUE)
-set(SDL2IMAGE_PCX TRUE)
-set(SDL2IMAGE_PNG TRUE)
-set(SDL2IMAGE_PNM TRUE)
-set(SDL2IMAGE_QOI TRUE)
-set(SDL2IMAGE_SVG TRUE)
-set(SDL2IMAGE_TGA TRUE)
-set(SDL2IMAGE_TIF TRUE)
-set(SDL2IMAGE_XCF TRUE)
-set(SDL2IMAGE_XPM TRUE)
-set(SDL2IMAGE_XV TRUE)
-set(SDL2IMAGE_WEBP FALSE)
-
-set(SDL2IMAGE_JPG_SAVE FALSE)
-set(SDL2IMAGE_PNG_SAVE FALSE)
-
-set(SDL2IMAGE_VENDORED FALSE)
-
-set(SDL2IMAGE_BACKEND_IMAGEIO FALSE)
-set(SDL2IMAGE_BACKEND_STB TRUE)
-set(SDL2IMAGE_BACKEND_WIC FALSE)
-
-string(REGEX REPLACE "SDL2_image\\.framework.*" "SDL2_image.framework" _sdl2image_framework_path "${CMAKE_CURRENT_LIST_DIR}")
-string(REGEX REPLACE "SDL2_image\\.framework.*" "" _sdl2image_framework_parent_path "${CMAKE_CURRENT_LIST_DIR}")
-
-# All targets are created, even when some might not be requested though COMPONENTS.
-# This is done for compatibility with CMake generated SDL2_image-target.cmake files.
-
-if(NOT TARGET SDL2_image::SDL2_image)
- add_library(SDL2_image::SDL2_image INTERFACE IMPORTED)
- set_target_properties(SDL2_image::SDL2_image
- PROPERTIES
- INTERFACE_COMPILE_OPTIONS "-F;${_sdl2image_framework_parent_path}"
- INTERFACE_INCLUDE_DIRECTORIES "${_sdl2image_framework_path}/Headers"
- INTERFACE_LINK_OPTIONS "-F;${_sdl2image_framework_parent_path};-framework;SDL2_image"
- COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
- INTERFACE_SDL2_SHARED "ON"
- )
-endif()
-
-unset(_sdl2image_framework_path)
-unset(_sdl2image_framework_parent_path)
diff --git a/Xcode/pkg-support/resources/CMake/sdl2_image-config-version.cmake b/Xcode/pkg-support/resources/CMake/sdl3_image-config-version.cmake
similarity index 100%
rename from Xcode/pkg-support/resources/CMake/sdl2_image-config-version.cmake
rename to Xcode/pkg-support/resources/CMake/sdl3_image-config-version.cmake
diff --git a/Xcode/pkg-support/resources/CMake/sdl3_image-config.cmake b/Xcode/pkg-support/resources/CMake/sdl3_image-config.cmake
new file mode 100644
index 00000000..af8b3d92
--- /dev/null
+++ b/Xcode/pkg-support/resources/CMake/sdl3_image-config.cmake
@@ -0,0 +1,61 @@
+# SDL3_image CMake configuration file:
+# This file is meant to be placed in Resources/CMake of a SDL3_image framework
+
+# INTERFACE_LINK_OPTIONS needs CMake 3.12
+cmake_minimum_required(VERSION 3.12)
+
+include(FeatureSummary)
+set_package_properties(SDL3_image PROPERTIES
+ URL "https://www.libsdl.org/projects/SDL_image/"
+ DESCRIPTION "SDL_image is an image file loading library"
+)
+
+set(SDL3_image_FOUND TRUE)
+
+set(SDL3IMAGE_AVIF FALSE)
+set(SDL3IMAGE_BMP TRUE)
+set(SDL3IMAGE_GIF TRUE)
+set(SDL3IMAGE_JPG TRUE)
+set(SDL3IMAGE_JXL FALSE)
+set(SDL3IMAGE_LBM TRUE)
+set(SDL3IMAGE_PCX TRUE)
+set(SDL3IMAGE_PNG TRUE)
+set(SDL3IMAGE_PNM TRUE)
+set(SDL3IMAGE_QOI TRUE)
+set(SDL3IMAGE_SVG TRUE)
+set(SDL3IMAGE_TGA TRUE)
+set(SDL3IMAGE_TIF TRUE)
+set(SDL3IMAGE_XCF TRUE)
+set(SDL3IMAGE_XPM TRUE)
+set(SDL3IMAGE_XV TRUE)
+set(SDL3IMAGE_WEBP FALSE)
+
+set(SDL3IMAGE_JPG_SAVE FALSE)
+set(SDL3IMAGE_PNG_SAVE FALSE)
+
+set(SDL3IMAGE_VENDORED FALSE)
+
+set(SDL3IMAGE_BACKEND_IMAGEIO FALSE)
+set(SDL3IMAGE_BACKEND_STB TRUE)
+set(SDL3IMAGE_BACKEND_WIC FALSE)
+
+string(REGEX REPLACE "SDL3_image\\.framework.*" "SDL3_image.framework" _sdl3image_framework_path "${CMAKE_CURRENT_LIST_DIR}")
+string(REGEX REPLACE "SDL3_image\\.framework.*" "" _sdl3image_framework_parent_path "${CMAKE_CURRENT_LIST_DIR}")
+
+# All targets are created, even when some might not be requested though COMPONENTS.
+# This is done for compatibility with CMake generated SDL3_image-target.cmake files.
+
+if(NOT TARGET SDL3_image::SDL3_image)
+ add_library(SDL3_image::SDL3_image INTERFACE IMPORTED)
+ set_target_properties(SDL3_image::SDL3_image
+ PROPERTIES
+ INTERFACE_COMPILE_OPTIONS "SHELL:-F;${_sdl3image_framework_parent_path}"
+ INTERFACE_INCLUDE_DIRECTORIES "${_sdl3image_framework_path}/Headers"
+ INTERFACE_LINK_OPTIONS "SHELL:-F;${_sdl3image_framework_parent_path};SHELL:-framework;SDL3_image"
+ COMPATIBLE_INTERFACE_BOOL "SDL3_SHARED"
+ INTERFACE_SDL3_SHARED "ON"
+ )
+endif()
+
+unset(_sdl3image_framework_path)
+unset(_sdl3image_framework_parent_path)
diff --git a/mingw/pkg-support/cmake/sdl2_image-config-version.cmake b/mingw/pkg-support/cmake/sdl2_image-config-version.cmake
deleted file mode 100644
index c37baed2..00000000
--- a/mingw/pkg-support/cmake/sdl2_image-config-version.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# SDL2_image CMake version configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL2_image-devel-2.x.y-mingw
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(sdl2_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../i686-w64-mingw32/lib/cmake/SDL2_image/sdl2_image-config-version.cmake")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(sdl2_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../x86_64-w64-mingw32/lib/cmake/SDL2_image/sdl2_image-config-version.cmake")
-else("${CMAKE_SIZEOF_VOID_P}" STREQUAL "")
- set(PACKAGE_VERSION_UNSUITABLE TRUE)
- return()
-endif()
-
-if(NOT EXISTS "${sdl2_image_config_path}")
- message(WARNING "${sdl2_image_config_path} does not exist: MinGW development package is corrupted")
- set(PACKAGE_VERSION_UNSUITABLE TRUE)
- return()
-endif()
-
-include("${sdl2_image_config_path}")
diff --git a/mingw/pkg-support/cmake/sdl2_image-config.cmake b/mingw/pkg-support/cmake/sdl2_image-config.cmake
deleted file mode 100644
index efefd023..00000000
--- a/mingw/pkg-support/cmake/sdl2_image-config.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# SDL2_image CMake configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL2_image-devel-2.x.y-mingw
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(sdl2_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../i686-w64-mingw32/lib/cmake/SDL2_image/sdl2_image-config.cmake")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(sdl2_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../x86_64-w64-mingw32/lib/cmake/SDL2_image/sdl2_image-config.cmake")
-else("${CMAKE_SIZEOF_VOID_P}" STREQUAL "")
- set(SDL2_image_FOUND FALSE)
- return()
-endif()
-
-if(NOT EXISTS "${sdl2_image_config_path}")
- message(WARNING "${sdl2_image_config_path} does not exist: MinGW development package is corrupted")
- set(SDL2_image_FOUND FALSE)
- return()
-endif()
-
-include("${sdl2_image_config_path}")
diff --git a/mingw/pkg-support/cmake/sdl3_image-config-version.cmake b/mingw/pkg-support/cmake/sdl3_image-config-version.cmake
new file mode 100644
index 00000000..51b02c28
--- /dev/null
+++ b/mingw/pkg-support/cmake/sdl3_image-config-version.cmake
@@ -0,0 +1,19 @@
+# SDL3_image CMake version configuration file:
+# This file is meant to be placed in a cmake subfolder of SDL3_image-devel-3.x.y-mingw
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set(sdl3_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../i686-w64-mingw32/lib/cmake/SDL3_image/sdl3_image-config-version.cmake")
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(sdl3_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../x86_64-w64-mingw32/lib/cmake/SDL3_image/sdl3_image-config-version.cmake")
+else("${CMAKE_SIZEOF_VOID_P}" STREQUAL "")
+ set(PACKAGE_VERSION_UNSUITABLE TRUE)
+ return()
+endif()
+
+if(NOT EXISTS "${sdl3_image_config_path}")
+ message(WARNING "${sdl3_image_config_path} does not exist: MinGW development package is corrupted")
+ set(PACKAGE_VERSION_UNSUITABLE TRUE)
+ return()
+endif()
+
+include("${sdl3_image_config_path}")
diff --git a/mingw/pkg-support/cmake/sdl3_image-config.cmake b/mingw/pkg-support/cmake/sdl3_image-config.cmake
new file mode 100644
index 00000000..51827a44
--- /dev/null
+++ b/mingw/pkg-support/cmake/sdl3_image-config.cmake
@@ -0,0 +1,19 @@
+# SDL3_image CMake configuration file:
+# This file is meant to be placed in a cmake subfolder of SDL3_image-devel-3.x.y-mingw
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set(sdl3_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../i686-w64-mingw32/lib/cmake/SDL3_image/SDL3_imageConfig.cmake")
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(sdl3_image_config_path "${CMAKE_CURRENT_LIST_DIR}/../x86_64-w64-mingw32/lib/cmake/SDL3_image/SDL3_imageConfig.cmake")
+else("${CMAKE_SIZEOF_VOID_P}" STREQUAL "")
+ set(SDL3_image_FOUND FALSE)
+ return()
+endif()
+
+if(NOT EXISTS "${sdl3_image_config_path}")
+ message(WARNING "${sdl3_image_config_path} does not exist: MinGW development package is corrupted")
+ set(SDL3_image_FOUND FALSE)
+ return()
+endif()
+
+include("${sdl3_image_config_path}")