Bladeren bron

cmake: move include(sdlfind.cmake) to main cmake script

Anonymous Maarten 2 jaren geleden
bovenliggende
commit
bb3a60bce5
3 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. 4 1
      CMakeLists.txt
  2. 0 3
      cmake/sdlchecks.cmake
  3. 1 1
      cmake/sdlfind.cmake

+ 4 - 1
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}")

+ 0 - 3
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})
 

+ 1 - 1
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()
+endmacro()