From e97dbe58fb616c0df5ffee9c80a087a0f05ba62c Mon Sep 17 00:00:00 2001 From: alef Date: Sun, 14 Aug 2022 17:28:35 +0200 Subject: [PATCH 01/10] Use CMake 3.21 or later --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 914a737713398..ca05361803ff8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.21) project(CataclysmDDA) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02af0cc502378..5bf3177279d3b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.21) add_subdirectory(${CMAKE_SOURCE_DIR}/src/third-party) From 538adf8667cfc550390cfee1f8fb3518e3d50a0f Mon Sep 17 00:00:00 2001 From: alef Date: Thu, 26 May 2022 19:55:28 +0200 Subject: [PATCH 02/10] Change all target_link_libraries to interface form --- src/CMakeLists.txt | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5bf3177279d3b..ad40c28c1b0a6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ if (TILES) ${CATACLYSM_DDA_HEADERS}) target_include_directories(cataclysm-tiles-common INTERFACE ${CMAKE_SOURCE_DIR}/src) - target_link_libraries(cataclysm-tiles-common third-party) + target_link_libraries(cataclysm-tiles-common PUBLIC third-party) if (WIN32) add_definitions(-DUSE_WINMAIN) @@ -81,7 +81,7 @@ if (TILES) endif () if (CMAKE_THREAD_LIBS_INIT) - target_link_libraries(cataclysm-tiles-common ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(cataclysm-tiles-common PUBLIC ${CMAKE_THREAD_LIBS_INIT}) endif () if (NOT DYNAMIC_LINKING) @@ -91,7 +91,7 @@ if (TILES) ${PNG_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR}) - target_link_libraries(cataclysm-tiles-common + target_link_libraries(cataclysm-tiles-common PUBLIC ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} @@ -102,7 +102,7 @@ if (TILES) ${SDL2_IMAGE_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) - target_link_libraries(cataclysm-tiles-common + target_link_libraries(cataclysm-tiles-common PUBLIC ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_TTF_LIBRARIES} @@ -111,24 +111,27 @@ if (TILES) if (SOUND) target_compile_definitions(cataclysm-tiles-common PUBLIC SDL_SOUND ) target_include_directories(cataclysm-tiles-common PUBLIC ${OGGVORBIS_INCLUDE_DIR}) - target_link_libraries(cataclysm-tiles-common ${OGG_LIBRARY}) - target_link_libraries(cataclysm-tiles-common ${VORBIS_LIBRARY}) - target_link_libraries(cataclysm-tiles-common ${VORBISFILE_LIBRARY}) + target_link_libraries(cataclysm-tiles-common PUBLIC ${OGG_LIBRARY}) + target_link_libraries(cataclysm-tiles-common PUBLIC ${VORBIS_LIBRARY}) + target_link_libraries(cataclysm-tiles-common PUBLIC ${VORBISFILE_LIBRARY}) target_include_directories(cataclysm-tiles-common PUBLIC ${SDL2_MIXER_INCLUDE_DIRS}) - target_link_libraries(cataclysm-tiles-common ${SDL2_MIXER_LIBRARIES}) + target_link_libraries(cataclysm-tiles-common PUBLIC ${SDL2_MIXER_LIBRARIES}) endif () if (WIN32) # Global settings for Windows targets (at end) - target_link_libraries(cataclysm-tiles-common gdi32.lib) - target_link_libraries(cataclysm-tiles-common winmm.lib) - target_link_libraries(cataclysm-tiles-common imm32.lib) - target_link_libraries(cataclysm-tiles-common ole32.lib) - target_link_libraries(cataclysm-tiles-common oleaut32.lib) - target_link_libraries(cataclysm-tiles-common version.lib) - target_link_libraries(cataclysm-tiles-common setupapi.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC gdi32.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC winmm.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC imm32.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC ole32.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC oleaut32.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC version.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC setupapi.lib) if (BACKTRACE) - target_link_libraries(cataclysm-tiles-common dbghelp.lib) + target_link_libraries(cataclysm-tiles-common PUBLIC dbghelp.lib) + if (LIBBACKTRACE) + target_link_libraries(cataclysm-tiles-common PUBLIC backtrace) + endif () endif () endif () From 0bedb0b3f12f9f08a711a6a6e9d7b13c2f671b46 Mon Sep 17 00:00:00 2001 From: alef Date: Tue, 24 May 2022 23:01:18 +0200 Subject: [PATCH 03/10] Change find_package if using VCPKG manitest - Add all SDL2:: targets found by VCPKG - Fix clang-tidy and cmake-lint --- CMakeLists.txt | 33 +++++++++++++++++++++++---------- src/CMakeLists.txt | 15 ++++++++++++++- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca05361803ff8..994c6bc6fa879 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,7 +265,7 @@ if (TILES) # Find SDL, SDL_ttf & SDL_image for graphical install message(STATUS "Searching for SDL2 library --") find_package(SDL2) - if (NOT SDL2_FOUND) + if (NOT (SDL2_FOUND OR TARGET SDL2::SDL2)) message(FATAL_ERROR "This project requires SDL2 to be installed to compile in graphical mode. \ Please install the SDL2 development libraries, \ @@ -285,7 +285,7 @@ if (TILES) message(STATUS "Searching for SDL2_TTF library --") find_package(SDL2_ttf) - if (NOT SDL2_TTF_FOUND) + if (NOT (SDL2_TTF_FOUND OR TARGET SDL2_ttf::SDL2_ttf OR TARGET SDL2_ttf::SDL2_ttf-static)) message(FATAL_ERROR "This project requires SDL2_ttf to be installed to compile in graphical mode. \ Please install the SDL2_ttf development libraries, \ @@ -294,8 +294,12 @@ if (TILES) endif () message(STATUS "Searching for SDL2_image library --") - find_package(SDL2_image) - if (NOT SDL2_IMAGE_FOUND) + if(VCPKG_MANIFEST_MODE) + find_package(sdl2-image) + else() + find_package(SDL2_image) + endif() + if (NOT (SDL2_IMAGE_FOUND OR TARGET SDL2::SDL2_image)) message(FATAL_ERROR "This project requires SDL2_image to be installed to compile in graphical mode. \ Please install the SDL2_image development libraries, \ @@ -335,12 +339,21 @@ if (SOUND) # Sound requires SDL_mixer library message(STATUS "Searching for SDL2_mixer library --") find_package(SDL2_mixer) - if (NOT SDL2_MIXER_FOUND) - message(FATAL_ERROR - "You need the SDL2_mixer development library \ - to be able to compile with sound enabled. \ - See doc/COMPILING/COMPILING-CMAKE.md for details and more info.") - endif () + if(VCPKG_MANIFEST_MODE) + if (NOT TARGET SDL2_mixer::SDL2_mixer-static) # TODO x64-mingw-static + message(FATAL_ERROR + "You need the SDL2_mixer development library \ + to be able to compile with sound enabled. \ + See doc/COMPILING/COMPILING-CMAKE.md for details and more info.") + endif() + else() + if (NOT SDL2_MIXER_FOUND) + message(FATAL_ERROR + "You need the SDL2_mixer development library \ + to be able to compile with sound enabled. \ + See doc/COMPILING/COMPILING-CMAKE.md for details and more info.") + endif () + endif() endif () if (BACKTRACE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ad40c28c1b0a6..f9a6479cf4076 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,6 +96,7 @@ if (TILES) ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${BZIP2_LIBRARIES}) + target_link_libraries(cataclysm-tiles-common PUBLIC SDL2::SDL2-static) endif () target_include_directories(cataclysm-tiles-common PUBLIC ${SDL2_INCLUDE_DIR} @@ -107,8 +108,20 @@ if (TILES) ${SDL2_IMAGE_LIBRARIES} ${SDL2_TTF_LIBRARIES} ${ZLIB_LIBRARIES}) - + if(TARGET SDL2::SDL2) + target_link_libraries(cataclysm-tiles-common PUBLIC SDL2::SDL2 + SDL2::SDL2main + SDL2::SDL2_image + $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>) + endif() if (SOUND) + if (VCPKG_MANIFEST_MODE) + find_package(Ogg REQUIRED) + find_package(Vorbis REQUIRED) + target_link_libraries(cataclysm-tiles-common PUBLIC SDL2_mixer::SDL2_mixer-static + Ogg::ogg + Vorbis::vorbis) + endif() target_compile_definitions(cataclysm-tiles-common PUBLIC SDL_SOUND ) target_include_directories(cataclysm-tiles-common PUBLIC ${OGGVORBIS_INCLUDE_DIR}) target_link_libraries(cataclysm-tiles-common PUBLIC ${OGG_LIBRARY}) From a539cc50bf76bd1c474fbd7faa1e83ccea844491 Mon Sep 17 00:00:00 2001 From: alef Date: Sun, 14 Aug 2022 21:32:55 +0200 Subject: [PATCH 04/10] Set the correct property for using ccache --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 994c6bc6fa879..28e626a609b6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -397,7 +397,9 @@ add_custom_target(uninstall find_program(CCACHE_FOUND ccache) if (CCACHE_FOUND AND CATA_CCACHE) - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) + set(CMAKE_C_COMPILER_LAUNCHER ccache) + set(CMAKE_CXX_COMPILER_LAUNCHER ccache) + set(CMAKE_C_LINKER_LAUNCHER ccache) + set(CMAKE_CXX_LINKER_LAUNCHER ccache) endif () From 81565c62a5bd331689ac112faef28e64e1ca16a6 Mon Sep 17 00:00:00 2001 From: alef Date: Sun, 14 Aug 2022 22:35:58 +0200 Subject: [PATCH 05/10] Set compiler launchers before adding subdirectories --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28e626a609b6e..5377c6fa19383 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -373,6 +373,14 @@ if (USE_HOME_DIR) add_definitions(-DUSE_HOME_DIR) endif () +find_program(CCACHE_FOUND ccache) +if (CCACHE_FOUND AND CATA_CCACHE) + set(CMAKE_C_COMPILER_LAUNCHER ccache) + set(CMAKE_CXX_COMPILER_LAUNCHER ccache) + set(CMAKE_C_LINKER_LAUNCHER ccache) + set(CMAKE_CXX_LINKER_LAUNCHER ccache) +endif () + add_subdirectory(src) add_subdirectory(data) if (NOT MSVC) @@ -395,11 +403,3 @@ add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -find_program(CCACHE_FOUND ccache) -if (CCACHE_FOUND AND CATA_CCACHE) - set(CMAKE_C_COMPILER_LAUNCHER ccache) - set(CMAKE_CXX_COMPILER_LAUNCHER ccache) - set(CMAKE_C_LINKER_LAUNCHER ccache) - set(CMAKE_CXX_LINKER_LAUNCHER ccache) -endif () - From ccea4c143fea32f69bd953fc37bcdddd3f8d7962 Mon Sep 17 00:00:00 2001 From: alef Date: Tue, 20 Sep 2022 16:31:04 +0200 Subject: [PATCH 06/10] Fix release installation paths --- CMakeLists.txt | 4 ++-- data/CMakeLists.txt | 9 +++------ lang/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5377c6fa19383..4e72b3ce9c6dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,10 +126,10 @@ endif () if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Windows|MSYS)") if (NOT DATA_PREFIX) - set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}) + set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/data) endif () if (NOT LOCALE_DIR) - set(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}) + set(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/lang) endif () if (NOT BIN_PREFIX) set(BIN_PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index fcfd8d57e2f9d..09b73144656f2 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -18,12 +18,6 @@ if (SOUND) ${CMAKE_SOURCE_DIR}/data/sound) endif () -if (TILES) - set(CATACLYSM_DATA_DIRS - ${CATACLYSM_DATA_DIRS} - ${CMAKE_SOURCE_DIR}/gfx) -endif () - set(CATACLYSM_DATA_FILES ${CMAKE_SOURCE_DIR}/data/changelog.txt ${CMAKE_SOURCE_DIR}/data/cataicon.ico @@ -33,4 +27,7 @@ set(CATACLYSM_DATA_FILES if (RELEASE) install(DIRECTORY ${CATACLYSM_DATA_DIRS} DESTINATION ${DATA_PREFIX}) install(FILES ${CATACLYSM_DATA_FILES} DESTINATION ${DATA_PREFIX}) + if (TILES) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() endif () diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index d27056140c996..9975e02f9e94e 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -92,7 +92,7 @@ foreach (LANG ${LANGUAGES}) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) if (RELEASE) if ("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") - #install(DIRECTORY ${CMAKE_SOURCE_DIR}/lang/mo/${LANG} DESTINATION ${DATA_PREFIX}) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/lang/mo/${LANG} DESTINATION ${LOCALE_DIR}/mo) else () install(DIRECTORY ${CMAKE_SOURCE_DIR}/lang/mo/${LANG} DESTINATION ${LOCALE_DIR}) endif () From b805302bb25f1b1385320cf61aac3345c67f66ed Mon Sep 17 00:00:00 2001 From: alef Date: Tue, 20 Sep 2022 18:08:45 +0200 Subject: [PATCH 07/10] Align CMake release install --- data/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 09b73144656f2..07e3e8dba73c6 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -21,13 +21,18 @@ endif () set(CATACLYSM_DATA_FILES ${CMAKE_SOURCE_DIR}/data/changelog.txt ${CMAKE_SOURCE_DIR}/data/cataicon.ico - ${CMAKE_SOURCE_DIR}/data/fontdata.json - ${CMAKE_SOURCE_DIR}/LICENSE.txt) + ${CMAKE_SOURCE_DIR}/data/fontdata.json) if (RELEASE) install(DIRECTORY ${CATACLYSM_DATA_DIRS} DESTINATION ${DATA_PREFIX}) install(FILES ${CATACLYSM_DATA_FILES} DESTINATION ${DATA_PREFIX}) + install(FILES + ${CMAKE_SOURCE_DIR}/README.md + ${CMAKE_SOURCE_DIR}/LICENSE.txt + ${CMAKE_SOURCE_DIR}/LICENSE-OFL-Terminus-Font.txt + DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc DESTINATION ${CMAKE_INSTALL_PREFIX}) if (TILES) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION ${CMAKE_INSTALL_PREFIX}) endif() endif () From 8c5a00119eeecdf1d7d08b95e08652a8fdc836ba Mon Sep 17 00:00:00 2001 From: alef Date: Thu, 29 Sep 2022 17:36:04 +0200 Subject: [PATCH 08/10] Make all "lang" directories at once --- lang/CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index 9975e02f9e94e..1c2daf095cd51 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -77,13 +77,16 @@ else () DEPENDS translations_prepare) endif () +set(dirs "${LANGUAGES}") +list(TRANSFORM dirs REPLACE \(.+\) lang/mo/\\1/LC_MESSAGES) +add_custom_command( + TARGET translations_prepare + PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E + make_directory ${dirs} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + foreach (LANG ${LANGUAGES}) - add_custom_command( - TARGET translations_prepare - PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E - make_directory ${CMAKE_SOURCE_DIR}/lang/mo/${LANG}/LC_MESSAGES - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) add_custom_command( TARGET translations_compile PRE_BUILD From 6c89a3aeda86928b7116ce4c0e98dcea3c45ed46 Mon Sep 17 00:00:00 2001 From: alef Date: Sun, 16 Oct 2022 11:28:35 +0200 Subject: [PATCH 09/10] Obey cmake-format linting --- lang/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index 1c2daf095cd51..0a3cdcbba3e49 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -77,13 +77,13 @@ else () DEPENDS translations_prepare) endif () -set(dirs "${LANGUAGES}") -list(TRANSFORM dirs REPLACE \(.+\) lang/mo/\\1/LC_MESSAGES) +set(DIRS "${LANGUAGES}") +list(TRANSFORM DIRS REPLACE "\(.+\)" lang/mo/\\1/LC_MESSAGES) add_custom_command( TARGET translations_prepare PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - make_directory ${dirs} + make_directory ${DIRS} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) foreach (LANG ${LANGUAGES}) From a27e10dd8ca2041b6f871507fc15e3290e8ad7e9 Mon Sep 17 00:00:00 2001 From: alef Date: Sun, 14 Aug 2022 17:41:48 +0200 Subject: [PATCH 10/10] Do not use our Find* modules under VCPKG --- CMakeLists.txt | 7 +++++-- CMakeModules/{ => Find}/FindIconv.cmake | 0 CMakeModules/{ => Find}/FindLibintl.cmake | 0 CMakeModules/{ => Find}/FindSDL2.cmake | 0 CMakeModules/{ => Find}/FindSDL2_image.cmake | 0 CMakeModules/{ => Find}/FindSDL2_mixer.cmake | 0 CMakeModules/{ => Find}/FindSDL2_ttf.cmake | 0 7 files changed, 5 insertions(+), 2 deletions(-) rename CMakeModules/{ => Find}/FindIconv.cmake (100%) rename CMakeModules/{ => Find}/FindLibintl.cmake (100%) rename CMakeModules/{ => Find}/FindSDL2.cmake (100%) rename CMakeModules/{ => Find}/FindSDL2_image.cmake (100%) rename CMakeModules/{ => Find}/FindSDL2_mixer.cmake (100%) rename CMakeModules/{ => Find}/FindSDL2_ttf.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e72b3ce9c6dc..672c9cf8d9335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,12 @@ cmake_minimum_required(VERSION 3.21) project(CataclysmDDA) -set(CMAKE_MODULE_PATH - ${CMAKE_MODULE_PATH} +list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules) +if (NOT VCPKG_MANIFEST_MODE) + list(APPEND CMAKE_MODULE_PATH + ${CMAKE_SOURCE_DIR}/CMakeModules/Find) +endif() set(CMAKE_TLS_VERIFY ON) diff --git a/CMakeModules/FindIconv.cmake b/CMakeModules/Find/FindIconv.cmake similarity index 100% rename from CMakeModules/FindIconv.cmake rename to CMakeModules/Find/FindIconv.cmake diff --git a/CMakeModules/FindLibintl.cmake b/CMakeModules/Find/FindLibintl.cmake similarity index 100% rename from CMakeModules/FindLibintl.cmake rename to CMakeModules/Find/FindLibintl.cmake diff --git a/CMakeModules/FindSDL2.cmake b/CMakeModules/Find/FindSDL2.cmake similarity index 100% rename from CMakeModules/FindSDL2.cmake rename to CMakeModules/Find/FindSDL2.cmake diff --git a/CMakeModules/FindSDL2_image.cmake b/CMakeModules/Find/FindSDL2_image.cmake similarity index 100% rename from CMakeModules/FindSDL2_image.cmake rename to CMakeModules/Find/FindSDL2_image.cmake diff --git a/CMakeModules/FindSDL2_mixer.cmake b/CMakeModules/Find/FindSDL2_mixer.cmake similarity index 100% rename from CMakeModules/FindSDL2_mixer.cmake rename to CMakeModules/Find/FindSDL2_mixer.cmake diff --git a/CMakeModules/FindSDL2_ttf.cmake b/CMakeModules/Find/FindSDL2_ttf.cmake similarity index 100% rename from CMakeModules/FindSDL2_ttf.cmake rename to CMakeModules/Find/FindSDL2_ttf.cmake