From 09e2f83e17bc4716d01ff09753670a7c0945b9a8 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Wed, 18 Jan 2023 18:05:54 +0100
Subject: [PATCH] cmake: no more SDL3_* cache variables
---
.github/workflows/msvc.yml | 2 +-
CMakeLists.txt | 8 ++++----
build-scripts/android-prefab.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index 0abfc50f5889..4e4c80bcbcec 100644
--- a/.github/workflows/msvc.yml
+++ b/.github/workflows/msvc.yml
@@ -48,7 +48,7 @@ jobs:
-DSDL_TESTS=ON `
-DSDL_INSTALL_TESTS=ON `
-DSDL_VENDOR_INFO="Github Workflow" `
- -DSDL3_DISABLE_INSTALL=OFF `
+ -DSDL_DISABLE_INSTALL=OFF `
${{ matrix.platform.flags }} `
-DCMAKE_INSTALL_PREFIX=prefix
- name: Build (CMake)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87c87739eae2..070853780a03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -356,8 +356,8 @@ foreach(_SUB ${SDL_SUBSYSTEMS})
endforeach()
# Allow some projects to be built conditionally.
-set_option(SDL3_DISABLE_INSTALL "Disable installation of SDL3" ${SDL3_SUBPROJECT})
-set_option(SDL3_DISABLE_UNINSTALL "Disable uninstallation of SDL3" OFF)
+set_option(SDL_DISABLE_INSTALL "Disable installation of SDL3" ${SDL3_SUBPROJECT})
+set_option(SDL_DISABLE_UNINSTALL "Disable uninstallation of SDL3" OFF)
option_string(SDL_ASSERTIONS "Enable internal sanity checks (auto/disabled/release/enabled/paranoid)" "auto")
#set_option(SDL_DEPENDENCY_TRACKING "Use gcc -MMD -MT dependency tracking" ON)
@@ -3216,7 +3216,7 @@ if(SDL_TEST)
target_link_libraries(SDL3_test PRIVATE ${EXTRA_TEST_LIBS})
endif()
-if(NOT SDL3_DISABLE_INSTALL)
+if(NOT SDL_DISABLE_INSTALL)
##### Configure installation folders #####
@@ -3376,7 +3376,7 @@ endif()
##### Uninstall target #####
-if(NOT SDL3_DISABLE_UNINSTALL)
+if(NOT SDL_DISABLE_UNINSTALL)
if(NOT TARGET uninstall)
configure_file(cmake/cmake_uninstall.cmake.in cmake_uninstall.cmake IMMEDIATE @ONLY)
diff --git a/build-scripts/android-prefab.sh b/build-scripts/android-prefab.sh
index 6d5344fc833a..586054204c0f 100755
--- a/build-scripts/android-prefab.sh
+++ b/build-scripts/android-prefab.sh
@@ -61,7 +61,7 @@ build_cmake_projects() {
-DSDL_STATIC=ON \
-DSDL_STATIC_PIC=ON \
-DSDL_TEST=ON \
- -DSDL3_DISABLE_INSTALL=OFF \
+ -DSDL_DISABLE_INSTALL=OFF \
-DCMAKE_INSTALL_PREFIX="${build_root}/build_${android_abi}/prefix" \
-DCMAKE_INSTALL_INCLUDEDIR=include \
-DCMAKE_INSTALL_LIBDIR=lib \