Remove remaining instance of find_package(SDL2 REQUIRED)

fleroviux · Oct 3, 2023 · a2ceb76 · a2ceb76
1 parent 1a86c9c
commit a2ceb76
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,12 @@ project(dual CXX)
 
 option(PLATFORM_SDL "Build SDL frontend" ON)
 
+find_package(PkgConfig REQUIRED)
+option(BUILD_STATIC "Build a statically linked executable" OFF)
+if(BUILD_STATIC)
+  list(APPEND PKG_CONFIG_EXECUTABLE "--static")
+endif()
+
 add_subdirectory(external)
 add_subdirectory(src/dual)
 

diff --git a/src/dual/CMakeLists.txt b/src/dual/CMakeLists.txt
@@ -103,5 +103,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 # @todo: remove this when properly implementing key input
-find_package(SDL2 REQUIRED)
-target_link_libraries(dual PRIVATE SDL2::SDL2)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(SDL2 REQUIRED IMPORTED_TARGET sdl2)
+target_link_libraries(dual PRIVATE PkgConfig::SDL2)
diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt
@@ -20,17 +20,8 @@ set(HEADERS
 )
 
 find_package(PkgConfig REQUIRED)
-
-option(BUILD_STATIC "Build a statically linked executable" OFF)
-
-if(BUILD_STATIC)
-  list(APPEND PKG_CONFIG_EXECUTABLE "--static")
-endif()
-
 pkg_check_modules(SDL2 REQUIRED IMPORTED_TARGET sdl2)
 
-#find_package(SDL2 REQUIRED)
-
 add_executable(dual-sdl ${SOURCES} ${HEADERS})
 target_include_directories(dual-sdl PRIVATE src)
 target_link_libraries(dual-sdl PRIVATE dual PkgConfig::SDL2)