mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-05-15 17:28:28 +00:00
cmake: no more SDL3_* cache variables
This commit is contained in:
parent
19d162281c
commit
09e2f83e17
3 changed files with 6 additions and 6 deletions
2
.github/workflows/msvc.yml
vendored
2
.github/workflows/msvc.yml
vendored
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue