|
@@ -274,9 +274,9 @@ if (ENABLE_SDL2)
|
|
|
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
|
|
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
|
|
|
target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
|
|
target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
|
|
|
else()
|
|
else()
|
|
|
- find_package(SDL2 2.0.12)
|
|
|
|
|
|
|
+ find_package(SDL2 2.0.14)
|
|
|
|
|
|
|
|
- if(SDL2_FOUND)
|
|
|
|
|
|
|
+ if (SDL2_FOUND)
|
|
|
# Some installations don't set SDL2_LIBRARIES
|
|
# Some installations don't set SDL2_LIBRARIES
|
|
|
if("${SDL2_LIBRARIES}" STREQUAL "")
|
|
if("${SDL2_LIBRARIES}" STREQUAL "")
|
|
|
message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
|
|
message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
|
|
@@ -286,10 +286,10 @@ if (ENABLE_SDL2)
|
|
|
include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
|
|
include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
|
|
|
add_library(SDL2 INTERFACE)
|
|
add_library(SDL2 INTERFACE)
|
|
|
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
|
|
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
|
|
|
|
|
+ else()
|
|
|
|
|
+ message(STATUS "SDL2 2.0.14 or newer not found, falling back to externals.")
|
|
|
endif()
|
|
endif()
|
|
|
endif()
|
|
endif()
|
|
|
-else()
|
|
|
|
|
- set(SDL2_FOUND NO)
|
|
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
# Install any missing dependencies with conan install
|
|
# Install any missing dependencies with conan install
|