mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[client,sdl] automatically use detected SDL

Browse Source 
* Automatically enable detected SDL version
* Abort if no SDL version is detected
This commit is contained in:
akallabeth 2024-05-16 23:05:44 +02:00
parent ff772084e6
commit e72f634fba
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/SDL/CMakeLists.txt
View File

@ -61,20 +61,26 @@ endif()
include(CMakeDependentOption) include(CMakeDependentOption)
find_package(SDL2)
find_package(SDL3)
cmake_dependent_option(WITH_CLIENT_SDL_VERSIONED "append sdl version to client binaries" OFF WITH_CLIENT_SDL OFF) cmake_dependent_option(WITH_CLIENT_SDL_VERSIONED "append sdl version to client binaries" OFF WITH_CLIENT_SDL OFF)
cmake_dependent_option(WITH_CLIENT_SDL2 "[experimental] build experimental SDL2 client" ON WITH_CLIENT_SDL OFF) cmake_dependent_option(WITH_CLIENT_SDL2 "[experimental] build experimental SDL2 client" ${SDL2_FOUND} WITH_CLIENT_SDL OFF)
cmake_dependent_option(WITH_CLIENT_SDL3 "[experimental] build experimental SDL3 client" OFF WITH_CLIENT_SDL OFF) cmake_dependent_option(WITH_CLIENT_SDL3 "[experimental] build experimental SDL3 client" ${SDL3_FOUND} WITH_CLIENT_SDL OFF)
if (WITH_CLIENT_SDL2 AND WITH_CLIENT_SDL3) if (WITH_CLIENT_SDL2 AND WITH_CLIENT_SDL3)
message("Building both, SDL2 and SDL3 clients, forcing WITH_CLIENT_SDL_VERSIONED=ON") message("Building both, SDL2 and SDL3 clients, forcing WITH_CLIENT_SDL_VERSIONED=ON")
set(WITH_CLIENT_SDL_VERSIONED ON) set(WITH_CLIENT_SDL_VERSIONED ON)
endif() endif()
if (NOT SDL2_FOUND AND NOT SDL3_FOUND)
message(FATAL_ERROR "No SDL library detected, giving up. Install SDL2 or SDL3 development package to fix")
endif()
add_subdirectory(common) add_subdirectory(common)
include_directories(common) include_directories(common)
if (WITH_CLIENT_SDL2) if (WITH_CLIENT_SDL2)
find_package(SDL2)
if (SDL2_FOUND) if (SDL2_FOUND)
add_subdirectory(SDL2) add_subdirectory(SDL2)
else() else()
@ -83,7 +89,6 @@ if (WITH_CLIENT_SDL2)
endif() endif()
if (WITH_CLIENT_SDL3) if (WITH_CLIENT_SDL3)
find_package(SDL3)
if (SDL3_FOUND) if (SDL3_FOUND)
add_subdirectory(SDL3) add_subdirectory(SDL3)
else() else()