Add vcpkg CONFIG mode support to Find modules and prioritize custom CMake module path

Try to find packages using CONFIG mode first (e.g., from vcpkg) before falling back to pkg-config or manual search. Create alias targets when needed to ensure compatibility. Change CMAKE_MODULE_PATH from APPEND to PREPEND to prioritize custom find modules. Downgrade KTX version to v4.3.1 for stability. Remove trailing whitespace.

Author: gpx1000

attachments/CMake/FindKTX.cmake

@@ -13,6 +13,17 @@
 #    KTX::ktx
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(ktx CONFIG QUIET)
+
+if(ktx_FOUND)
+  if(NOT TARGET KTX::ktx AND TARGET ktx::ktx)
+    add_library(KTX::ktx ALIAS ktx::ktx)
+  endif()
+  set(KTX_FOUND TRUE)
+  return()
+endif()
+
 # Check if we're on Linux - if so, we'll skip the search and directly use FetchContent
 if(UNIX AND NOT APPLE)
   # On Linux, we assume KTX is not installed and proceed directly to fetching it

attachments/CMake/Findglm.cmake

@@ -12,6 +12,16 @@
 #    glm::glm
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(glm CONFIG QUIET)
+
+if(glm_FOUND)
+  if(NOT TARGET glm::glm AND TARGET glm)
+    add_library(glm::glm ALIAS glm)
+  endif()
+  return()
+endif()
+
 # Try to find the package using pkg-config first
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
@@ -94,7 +104,7 @@ endif()
 
 # Set the variables
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(glm 
+find_package_handle_standard_args(glm
   REQUIRED_VARS glm_INCLUDE_DIR
 )
 

attachments/CMake/Findnlohmann_json.cmake

@@ -12,6 +12,16 @@
 #    nlohmann_json::nlohmann_json
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(nlohmann_json CONFIG QUIET)
+
+if(nlohmann_json_FOUND)
+  if(NOT TARGET nlohmann_json::nlohmann_json AND TARGET nlohmann_json)
+    add_library(nlohmann_json::nlohmann_json ALIAS nlohmann_json)
+  endif()
+  return()
+endif()
+
 # Try to find the package using pkg-config first
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)

attachments/CMake/Findtinygltf.cmake

@@ -12,6 +12,16 @@
 #    tinygltf::tinygltf
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(tinygltf CONFIG QUIET)
+
+if(tinygltf_FOUND)
+  if(NOT TARGET tinygltf::tinygltf AND TARGET tinygltf)
+    add_library(tinygltf::tinygltf ALIAS tinygltf)
+  endif()
+  return()
+endif()
+
 # First, try to find nlohmann_json
 find_package(nlohmann_json QUIET)
 if(NOT nlohmann_json_FOUND)

attachments/CMake/Findtinyobjloader.cmake

@@ -9,6 +9,16 @@
 # It also defines the following targets:
 #   tinyobjloader::tinyobjloader
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(tinyobjloader CONFIG QUIET)
+
+if(tinyobjloader_FOUND)
+  if(NOT TARGET tinyobjloader::tinyobjloader AND TARGET tinyobjloader)
+    add_library(tinyobjloader::tinyobjloader ALIAS tinyobjloader)
+  endif()
+  return()
+endif()
+
 # Try to find the package using pkg-config first
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
@@ -109,7 +119,7 @@ endif()
 
 # Set the variables
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(tinyobjloader 
+find_package_handle_standard_args(tinyobjloader
   REQUIRED_VARS tinyobjloader_INCLUDE_DIR
 )
 

attachments/CMakeLists.txt

@@ -11,7 +11,7 @@ endif()
 
 project (VulkanTutorial)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
 
 # Add option to enable/disable C++ 20 module
 option(ENABLE_CPP20_MODULE "Enable C++ 20 module support for Vulkan" OFF)

attachments/simple_engine/CMake/FindKTX.cmake

@@ -13,6 +13,17 @@
 #    KTX::ktx
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(ktx CONFIG QUIET)
+
+if(ktx_FOUND)
+  if(NOT TARGET KTX::ktx AND TARGET ktx::ktx)
+    add_library(KTX::ktx ALIAS ktx::ktx)
+  endif()
+  set(KTX_FOUND TRUE)
+  return()
+endif()
+
 # Check if we're on Linux - if so, we'll skip the search and directly use FetchContent
 if(UNIX AND NOT APPLE)
   # On Linux, we assume KTX is not installed and proceed directly to fetching it
@@ -70,7 +81,7 @@ if(NOT KTX_FOUND)
   FetchContent_Declare(
     ktx
     GIT_REPOSITORY https://github.com/KhronosGroup/KTX-Software.git
-    GIT_TAG v4.4.2  # Use a specific tag for stability
+    GIT_TAG v4.3.1  # Use a specific tag for stability
   )
 
   # Set options to minimize build time and dependencies

attachments/simple_engine/CMake/Findglm.cmake

@@ -12,6 +12,16 @@
 #    glm::glm
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(glm CONFIG QUIET)
+
+if(glm_FOUND)
+  if(NOT TARGET glm::glm AND TARGET glm)
+    add_library(glm::glm ALIAS glm)
+  endif()
+  return()
+endif()
+
 # Try to find the package using pkg-config first
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
@@ -94,7 +104,7 @@ endif()
 
 # Set the variables
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(glm 
+find_package_handle_standard_args(glm
   REQUIRED_VARS glm_INCLUDE_DIR
 )
 

attachments/simple_engine/CMake/Findnlohmann_json.cmake

@@ -12,6 +12,16 @@
 #    nlohmann_json::nlohmann_json
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(nlohmann_json CONFIG QUIET)
+
+if(nlohmann_json_FOUND)
+  if(NOT TARGET nlohmann_json::nlohmann_json AND TARGET nlohmann_json)
+    add_library(nlohmann_json::nlohmann_json ALIAS nlohmann_json)
+  endif()
+  return()
+endif()
+
 # Try to find the package using pkg-config first
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)

attachments/simple_engine/CMake/Findtinygltf.cmake

@@ -12,6 +12,16 @@
 #    tinygltf::tinygltf
 #
 
+# Try to find the package using CONFIG mode first (e.g., from vcpkg)
+find_package(tinygltf CONFIG QUIET)
+
+if(tinygltf_FOUND)
+  if(NOT TARGET tinygltf::tinygltf AND TARGET tinygltf)
+    add_library(tinygltf::tinygltf ALIAS tinygltf)
+  endif()
+  return()
+endif()
+
 # First, try to find nlohmann_json
 find_package(nlohmann_json QUIET)
 if(NOT nlohmann_json_FOUND)