From 1efb9f4defd7878246e9acb1ca7e11ec5b511711 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 2 May 2021 13:05:20 +0300 Subject: [PATCH] - cleaned and minimized SDL2 version check --- src/CMakeLists.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 31b19fa67..77378bc48 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -178,20 +178,18 @@ else() # Non-Windows version also needs SDL except native OS X backend if( NOT APPLE OR NOT OSX_COCOA_BACKEND ) find_package( SDL2 REQUIRED CONFIG ) - include_directories( "${SDL2_INCLUDE_DIRS}" ) - set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}" "${SDL2_INCLUDE_DIRS}") - CHECK_CXX_SOURCE_COMPILES("#include - int main() - { - #if !SDL_VERSION_ATLEAST(2, 0, 6) - #error \"Only SDL 2.0.6 or later is supported.\" - #endif - return 0; - }" SDL2_MIN_VERSION ) - if (NOT SDL2_MIN_VERSION) - message(SEND_ERROR "Only SDL 2.0.6 or later is supported.") + set( CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}" "${SDL2_INCLUDE_DIRS}" ) + CHECK_CXX_SOURCE_COMPILES( "#include + #if SDL_VERSION_ATLEAST(2, 0, 6) + int main() {} + #endif" SDL2_MIN_VERSION ) + + if ( NOT SDL2_MIN_VERSION ) + message( SEND_ERROR "Only SDL 2.0.6 or later is supported." ) endif() + + include_directories( "${SDL2_INCLUDE_DIRS}" ) set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SDL2_LIBRARIES}" ) endif()