Do not use our Find* modules under VCPKG

cataclysmbnteam · Oct 17, 2023 · 9e56d53 · 9e56d53
1 parent 41f46d5
commit 9e56d53
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.21)
 
 project(CataclysmBN)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeModules)
+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()
 
 include(AstyleFormatSource)
 

diff --git a/CMakeModules/FindSDL2.cmake → CMakeModules/Find/FindSDL2.cmake b/CMakeModules/FindSDL2.cmake → CMakeModules/Find/FindSDL2.cmake
diff --git a/CMakeModules/FindSDL2_image.cmake → CMakeModules/Find/FindSDL2_image.cmake b/CMakeModules/FindSDL2_image.cmake → CMakeModules/Find/FindSDL2_image.cmake
diff --git a/CMakeModules/FindSDL2_mixer.cmake → CMakeModules/Find/FindSDL2_mixer.cmake b/CMakeModules/FindSDL2_mixer.cmake → CMakeModules/Find/FindSDL2_mixer.cmake
diff --git a/CMakeModules/FindSDL2_ttf.cmake → CMakeModules/Find/FindSDL2_ttf.cmake b/CMakeModules/FindSDL2_ttf.cmake → CMakeModules/Find/FindSDL2_ttf.cmake