geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: no more SDL3_* cache variables

main
Anonymous Maarten 2023-01-18 18:05:54 +01:00 committed by Anonymous Maarten
parent 19d162281c
commit 09e2f83e17
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/msvc.yml vendored
View File

@ -48,7 +48,7 @@ jobs:
-DSDL_TESTS=ON ` -DSDL_TESTS=ON `
-DSDL_INSTALL_TESTS=ON ` -DSDL_INSTALL_TESTS=ON `
-DSDL_VENDOR_INFO="Github Workflow" ` -DSDL_VENDOR_INFO="Github Workflow" `
-DSDL3_DISABLE_INSTALL=OFF ` -DSDL_DISABLE_INSTALL=OFF `
${{ matrix.platform.flags }} ` ${{ matrix.platform.flags }} `
-DCMAKE_INSTALL_PREFIX=prefix -DCMAKE_INSTALL_PREFIX=prefix
- name: Build (CMake) - name: Build (CMake)

8
CMakeLists.txt
View File

@ -356,8 +356,8 @@ foreach(_SUB ${SDL_SUBSYSTEMS})
endforeach() endforeach()
# Allow some projects to be built conditionally. # Allow some projects to be built conditionally.
set_option(SDL3_DISABLE_INSTALL "Disable installation of SDL3" ${SDL3_SUBPROJECT}) set_option(SDL_DISABLE_INSTALL "Disable installation of SDL3" ${SDL3_SUBPROJECT})
set_option(SDL3_DISABLE_UNINSTALL "Disable uninstallation of SDL3" OFF) set_option(SDL_DISABLE_UNINSTALL "Disable uninstallation of SDL3" OFF)
option_string(SDL_ASSERTIONS "Enable internal sanity checks (auto/disabled/release/enabled/paranoid)" "auto") 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) #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}) target_link_libraries(SDL3_test PRIVATE ${EXTRA_TEST_LIBS})
endif() endif()
if(NOT SDL3_DISABLE_INSTALL) if(NOT SDL_DISABLE_INSTALL)
##### Configure installation folders ##### ##### Configure installation folders #####
@ -3376,7 +3376,7 @@ endif()
##### Uninstall target ##### ##### Uninstall target #####
if(NOT SDL3_DISABLE_UNINSTALL) if(NOT SDL_DISABLE_UNINSTALL)
if(NOT TARGET uninstall) if(NOT TARGET uninstall)
configure_file(cmake/cmake_uninstall.cmake.in cmake_uninstall.cmake IMMEDIATE @ONLY) configure_file(cmake/cmake_uninstall.cmake.in cmake_uninstall.cmake IMMEDIATE @ONLY)

2
build-scripts/android-prefab.sh
View File

@ -61,7 +61,7 @@ build_cmake_projects() {
-DSDL_STATIC=ON \ -DSDL_STATIC=ON \
-DSDL_STATIC_PIC=ON \ -DSDL_STATIC_PIC=ON \
-DSDL_TEST=ON \ -DSDL_TEST=ON \
-DSDL3_DISABLE_INSTALL=OFF \ -DSDL_DISABLE_INSTALL=OFF \
-DCMAKE_INSTALL_PREFIX="${build_root}/build_${android_abi}/prefix" \ -DCMAKE_INSTALL_PREFIX="${build_root}/build_${android_abi}/prefix" \
-DCMAKE_INSTALL_INCLUDEDIR=include \ -DCMAKE_INSTALL_INCLUDEDIR=include \
-DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_LIBDIR=lib \