Do not use our Find* modules under VCPKG

2022-08-14 17:41:48 +02:00 · 2022-08-14 17:41:48 +02:00 · a27e10dd8c
parent 6c89a3aeda
commit a27e10dd8c
7 changed files with 5 additions and 2 deletions
--- 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)

--- a/CMakeModules/Find/FindIconv.cmake
+++ b/CMakeModules/Find/FindIconv.cmake
--- a/CMakeModules/Find/FindLibintl.cmake
+++ b/CMakeModules/Find/FindLibintl.cmake
--- a/CMakeModules/Find/FindSDL2.cmake
+++ b/CMakeModules/Find/FindSDL2.cmake
--- a/CMakeModules/Find/FindSDL2_image.cmake
+++ b/CMakeModules/Find/FindSDL2_image.cmake
--- a/CMakeModules/Find/FindSDL2_mixer.cmake
+++ b/CMakeModules/Find/FindSDL2_mixer.cmake
--- a/CMakeModules/Find/FindSDL2_ttf.cmake
+++ b/CMakeModules/Find/FindSDL2_ttf.cmake