From bb3a60bce5494ddf544d5d342884b3a5466461bd Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Mon, 23 Jan 2023 03:04:35 +0100
Subject: [PATCH] cmake: move include(sdlfind.cmake) to main cmake script
---
CMakeLists.txt | 5 ++++-
cmake/sdlchecks.cmake | 3 ---
cmake/sdlfind.cmake | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4137735fc4f6..357fffc55a8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
include(CheckStructHasMember)
include(CMakeDependentOption)
+include(CMakeParseArguments)
include(CMakePushCheckState)
include(GNUInstallDirs)
@@ -72,6 +73,7 @@ find_package(PkgConfig)
list(APPEND CMAKE_MODULE_PATH "${SDL3_SOURCE_DIR}/cmake")
include(${SDL3_SOURCE_DIR}/cmake/macros.cmake)
include(${SDL3_SOURCE_DIR}/cmake/sdlchecks.cmake)
+include(${SDL3_SOURCE_DIR}/cmake/sdlfind.cmake)
include(${SDL3_SOURCE_DIR}/cmake/sdlplatform.cmake)
include(${SDL3_SOURCE_DIR}/cmake/CheckCPUArchitecture.cmake)
include(${SDL3_SOURCE_DIR}/cmake/GetGitRevisionDescription.cmake)
@@ -3001,6 +3003,7 @@ list(REMOVE_DUPLICATES INFO_SHARED_LDFLAGS)
listtostr(INFO_SHARED_LDFLAGS INFO_SHARED_LDFLAGS)
listtostr(SDL_EXTRA_LIBS INFO_EXTRA_LIBS)
+listtostr(SDL_CMAKE_DEPENDS INFO_CMAKE_DEPENDS)
##### Info output #####
message(STATUS "")
@@ -3036,7 +3039,7 @@ message(STATUS " EXTRA DEFS: ${INFO_DEFS}")
message(STATUS " EXTRA CFLAGS: ${INFO_CFLAGS} ${INFO_CHECKS}")
message(STATUS " EXTRA INCDIRS: ${INFO_INCDIRS}")
message(STATUS " EXTRA LDFLAGS: ${INFO_SHARED_LDFLAGS} ${INFO_EXTRA_LDFLAGS}")
-message(STATUS " EXTRA LIBS: ${INFO_EXTRA_LIBS}")
+message(STATUS " EXTRA LIBS: ${INFO_EXTRA_LIBS} ${INFO_CMAKE_DEPENDS}")
message(STATUS "")
message(STATUS " Build Shared Library: ${SDL_SHARED}")
message(STATUS " Build Static Library: ${SDL_STATIC}")
diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
index aca83f5386b9..294fec6cfa08 100644
--- a/cmake/sdlchecks.cmake
+++ b/cmake/sdlchecks.cmake
@@ -1,6 +1,3 @@
-include(CMakeParseArguments)
-include(${SDL3_SOURCE_DIR}/cmake/sdlfind.cmake)
-
macro(FindLibraryAndSONAME _LIB)
cmake_parse_arguments(FLAS "" "" "LIBDIRS" ${ARGN})
diff --git a/cmake/sdlfind.cmake b/cmake/sdlfind.cmake
index c732f7142bc3..a8145484f0b8 100644
--- a/cmake/sdlfind.cmake
+++ b/cmake/sdlfind.cmake
@@ -6,4 +6,4 @@ macro(sdlFindALSA)
set_property(TARGET ALSA::ALSA PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIRS})
set_property(TARGET ALSA::ALSA APPEND PROPERTY IMPORTED_LOCATION ${ALSA_LIBRARY})
endif()
-endmacro()
\ No newline at end of file
+endmacro()