From 3396c84c703eda256e7ba4e797703e6827d36bb6 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 11 Jun 2022 03:00:41 +0200
Subject: [PATCH] Remove SDL_image specific variable from
PrivateSdlFunctions.cmake
---
CMakeLists.txt | 14 +++++++-------
cmake/PrivateSdlFunctions.cmake | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70b34d4c..e356f813 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,7 @@ endif()
if(SDL2IMAGE_ZLIB)
if(SDL2IMAGE_ZLIB_VENDORED)
message(STATUS "${PROJECT_NAME}: Using vendored zlib")
- sdl_check_project_in_subfolder(external/zlib zlib)
+ sdl_check_project_in_subfolder(external/zlib zlib SDL2IMAGE_VENDORED)
add_subdirectory(external/zlib EXCLUDE_FROM_ALL)
# PNG_BUILD_ZLIB variable is used by vendored libpng
set(PNG_BUILD_ZLIB ON CACHE BOOL "libpng option to tell it should use 'our' vendored ZLIB library" FORCE)
@@ -336,7 +336,7 @@ if(SDL2IMAGE_AVIF)
if(SDL2IMAGE_AVIF_VENDORED)
message(STATUS "${PROJECT_NAME}: Using vendored libavif")
message(FATAL_ERROR "libavif is not vendored (yet)")
- sdl_check_project_in_subfolder(external/libavif libavif)
+ sdl_check_project_in_subfolder(external/libavif libavif SDL2IMAGE_VENDORED)
set(BUILD_SHARED_LIBS ${SDL2IMAGE_AVIF_SHARED})
add_subdirectory(external/libavif EXCLUDE_FROM_ALL)
list(APPEND INSTALL_EXTRA_TARGETS libavif)
@@ -381,7 +381,7 @@ if(SDL2IMAGE_JPG)
if(NOT SDL2IMAGE_BACKEND_STB AND NOT SDL2IMAGE_BACKEND_WIC AND NOT SDL2IMAGE_BACKEND_IMAGEIO)
if(SDL2IMAGE_JPG_VENDORED)
message(STATUS "${PROJECT_NAME}: Using vendored libjpeg")
- sdl_check_project_in_subfolder(external/jpeg libjpeg)
+ sdl_check_project_in_subfolder(external/jpeg libjpeg SDL2IMAGE_VENDORED)
set(BUILD_SHARED_LIBS ${SDL2IMAGE_JPG_SHARED})
add_subdirectory(external/jpeg EXCLUDE_FROM_ALL)
list(APPEND INSTALL_EXTRA_TARGETS jpeg)
@@ -425,7 +425,7 @@ if(SDL2IMAGE_JXL)
set(JPEGXL_ENABLE_SKCMS OFF CACHE BOOL "libjxl skcms option" FORCE)
# JPEGXL_FORCE_SYSTEM_HWY variable is used by libjxl
set(JPEGXL_FORCE_SYSTEM_HWY OFF CACHE BOOL "libjxl highway option" FORCE)
- sdl_check_project_in_subfolder(external/libjxl libjxl)
+ sdl_check_project_in_subfolder(external/libjxl libjxl SDL2IMAGE_VENDORED)
set(BUILD_SHARED_LIBS ${SDL2IMAGE_JXL_SHARED})
add_subdirectory(external/libjxl EXCLUDE_FROM_ALL)
if(BUILD_SHARED_LIBS)
@@ -483,7 +483,7 @@ if(SDL2IMAGE_PNG)
set(HAVE_LD_VERSION_SCRIPT OFF CACHE BOOL "" FORCE)
if(SDL2IMAGE_PNG_VENDORED)
message(STATUS "${PROJECT_NAME}: Using vendored libpng")
- sdl_check_project_in_subfolder(external/libpng libpng)
+ sdl_check_project_in_subfolder(external/libpng libpng SDL2IMAGE_VENDORED)
add_subdirectory(external/libpng EXCLUDE_FROM_ALL)
if(SDL2IMAGE_BUILD_SHARED_LIBS)
set(PNG_LIBRARY png)
@@ -564,7 +564,7 @@ if(SDL2IMAGE_TIF)
set(ZSTD_FOUND OFF)
# WEBP_LIBRARY variable is used by vendored libtiff
set(WEBP_LIBRARY "")
- sdl_check_project_in_subfolder(external/libtiff libtiff)
+ sdl_check_project_in_subfolder(external/libtiff libtiff SDL2IMAGE_VENDORED)
set(BUILD_SHARED_LIBS ${SDL2IMAGE_TIF_SHARED})
add_subdirectory(external/libtiff EXCLUDE_FROM_ALL)
add_library(TIFF::TIFF ALIAS tiff)
@@ -599,7 +599,7 @@ if(SDL2IMAGE_WEBP)
# missing cpufeatures
if(SDL2IMAGE_WEBP_VENDORED)
message(STATUS "${PROJECT_NAME}: Using vendored libwebp")
- sdl_check_project_in_subfolder(external/libwebp libwebp)
+ sdl_check_project_in_subfolder(external/libwebp libwebp SDL2IMAGE_VENDORED)
set(BUILD_SHARED_LIBS ${SDL2IMAGE_WEBP_SHARED})
add_subdirectory(external/libwebp EXCLUDE_FROM_ALL)
target_include_directories(SDL2_image PRIVATE external/libwebp/src)
diff --git a/cmake/PrivateSdlFunctions.cmake b/cmake/PrivateSdlFunctions.cmake
index acfe943c..571e66a0 100644
--- a/cmake/PrivateSdlFunctions.cmake
+++ b/cmake/PrivateSdlFunctions.cmake
@@ -212,10 +212,10 @@ function(target_get_dynamic_library DEST TARGET)
set(${DEST} ${result} PARENT_SCOPE)
endfunction()
-macro(sdl_check_project_in_subfolder relative_subfolder name)
+macro(sdl_check_project_in_subfolder relative_subfolder name vendored_option)
if(NOT EXISTS "${PROJECT_SOURCE_DIR}/${relative_subfolder}/CMakeLists.txt")
message(FATAL_ERROR "No cmake project for ${name} found in ${relative_subfolder}.\n"
- "Run the download script in the external folder, or re-configure with -DSDL2IMAGE_VENDORED=OFF to use system packages.")
+ "Run the download script in the external folder, or re-configure with -D${vendored_option}=OFF to use system packages.")
endif()
endmacro()