CMake: use existing SDL2Config.cmake.in to find SDL2

https://stackoverflow.com/questions/54005991/what-happened-to-findsdl2-in-cmake
OpenXRay · Aug 26, 2022 · 7682dec · 7682dec
1 parent b4dbe50
commit 7682dec
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 179 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -232,6 +232,7 @@ endif()
 set(LUA_INCLUDE_DIR Externals/LuaJIT/src)
 
 if (NOT WIN32)
+    find_package(SDL2 REQUIRED)
     find_package(OpenGL REQUIRED)
     find_package(GLEW REQUIRED)
     find_package(OpenAL REQUIRED)
@@ -244,7 +245,6 @@ if (NOT WIN32)
     endif()
     find_package(Theora REQUIRED)
     find_package(Ogg REQUIRED)
-    find_package(SDL REQUIRED)
     find_package(LZO REQUIRED)
 endif()
 

diff --git a/cmake/FindSDL.cmake b/cmake/FindSDL.cmake
diff --git a/src/Layers/xrRenderPC_GL/CMakeLists.txt b/src/Layers/xrRenderPC_GL/CMakeLists.txt
@@ -398,7 +398,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_SOURCE_DIR}/Externals/luabind
     ${CMAKE_SOURCE_DIR}/Externals/gli
     ${CMAKE_SOURCE_DIR}/Externals/gli/external/glm
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}

diff --git a/src/Layers/xrRenderPC_R1/CMakeLists.txt b/src/Layers/xrRenderPC_R1/CMakeLists.txt
@@ -32,7 +32,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/Externals/luabind
     ${CMAKE_SOURCE_DIR}/sdk/include
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}
@@ -45,7 +45,7 @@ target_link_libraries(${PROJECT_NAME}
     xrScriptEngine
     xrAPI
     xrMiscMath
-    ${SDL_LIBRARIES}
+    ${SDL2_LIBRARIES}
 )
 
 target_compile_definitions(${PROJECT_NAME}

diff --git a/src/xrCDB/CMakeLists.txt b/src/xrCDB/CMakeLists.txt
@@ -43,7 +43,7 @@ add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 target_include_directories(${PROJECT_NAME}
     PRIVATE
     ${CMAKE_SOURCE_DIR}/src
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}

diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
@@ -407,7 +407,7 @@ add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 
 target_include_directories(${PROJECT_NAME}
     PUBLIC
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src
@@ -418,7 +418,7 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
     pthread
-    ${SDL_LIBRARIES}
+    ${SDL2_LIBRARIES}
     $<$<BOOL:${USE_CRYPTOPP}>:${CRYPTO++_LIBRARIES}>
     PRIVATE
     xrMiscMath

diff --git a/src/xrEngine/CMakeLists.txt b/src/xrEngine/CMakeLists.txt
@@ -384,7 +384,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/Externals/OpenAutomate/inc
     ${CMAKE_SOURCE_DIR}/Externals/luabind
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}
@@ -402,7 +402,7 @@ target_link_libraries(${PROJECT_NAME}
     ${OGG_LIBRARIES}
     xrCDB
     ${OPENAL_LIBRARY}
-    ${SDL_LIBRARIES}
+    ${SDL2_LIBRARIES}
 )
 
 target_compile_definitions(${PROJECT_NAME}

diff --git a/src/xrGame/CMakeLists.txt b/src/xrGame/CMakeLists.txt
@@ -2629,7 +2629,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_SOURCE_DIR}/Externals/ode/include
     ${CMAKE_SOURCE_DIR}/Externals/OpenAutomate/inc
     ${CMAKE_SOURCE_DIR}/sdk/include
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}
@@ -2649,7 +2649,7 @@ target_link_libraries(${PROJECT_NAME}
     xrCDB
     xrPhysics
     xrNetServer
-    ${SDL_LIBRARIES}
+    ${SDL2_LIBRARIES}
 )
 
 target_compile_definitions(${PROJECT_NAME}

diff --git a/src/xrGameSpy/CMakeLists.txt b/src/xrGameSpy/CMakeLists.txt
@@ -53,15 +53,15 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_SOURCE_DIR}/Externals/luabind
     ${CMAKE_SOURCE_DIR}/Externals/ode/include
     ${CMAKE_SOURCE_DIR}/Externals/OpenAutomate/inc
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
     xrCore
     xrMiscMath
     GameSpy-oxr
-    ${SDL_LIBRARIES}
+    ${SDL2_LIBRARIES}
 )
 
 target_compile_definitions(${PROJECT_NAME}

diff --git a/src/xrPhysics/CMakeLists.txt b/src/xrPhysics/CMakeLists.txt
@@ -360,7 +360,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/Externals/ode/include
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}

diff --git a/src/xrScriptEngine/CMakeLists.txt b/src/xrScriptEngine/CMakeLists.txt
@@ -102,7 +102,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/Externals/luabind
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}

diff --git a/src/xrSound/CMakeLists.txt b/src/xrSound/CMakeLists.txt
@@ -114,7 +114,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_SOURCE_DIR}/Externals/libogg/include
     ${CMAKE_SOURCE_DIR}/Externals/openal/include
     ${OGG_INCLUDE_DIRS}
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}

diff --git a/src/xrUICore/CMakeLists.txt b/src/xrUICore/CMakeLists.txt
@@ -141,7 +141,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/Externals/lzo/include
     ${CMAKE_SOURCE_DIR}/Externals/luabind
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(xrUICore
@@ -152,7 +152,7 @@ target_link_libraries(xrUICore
     xrMiscMath
     xrCore
     xrLuabind
-    ${SDL_LIBRARIES}
+    ${SDL2_LIBRARIES}
 )
 
 if (WIN32)

diff --git a/src/xr_3da/CMakeLists.txt b/src/xr_3da/CMakeLists.txt
@@ -16,7 +16,7 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT $
 target_include_directories(${PROJECT_NAME}
     PRIVATE
     ${CMAKE_SOURCE_DIR}/src
-    ${SDL_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}