Revert "Restrict vcpkg dependencies to Windows platform and improve CMake module path handling"

gpx1000 · gpx1000 · commit bf882ab9450a · 2026-03-02T16:55:56.000-08:00
This reverts commit 67a28b9.
diff --git a/attachments/CMake/FindKTX.cmake b/attachments/CMake/FindKTX.cmake
@@ -14,11 +14,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(ktx CONFIG QUIET)
-else()
-  find_package(ktx CONFIG QUIET)
-endif()
+find_package(ktx CONFIG QUIET)
 
 if(ktx_FOUND)
   if(NOT TARGET KTX::ktx AND TARGET ktx::ktx)
diff --git a/attachments/CMake/Findglm.cmake b/attachments/CMake/Findglm.cmake
@@ -13,11 +13,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(glm CONFIG QUIET)
-else()
-  find_package(glm CONFIG QUIET)
-endif()
+find_package(glm CONFIG QUIET)
 
 if(glm_FOUND)
   if(NOT TARGET glm::glm AND TARGET glm)
diff --git a/attachments/CMake/Findnlohmann_json.cmake b/attachments/CMake/Findnlohmann_json.cmake
@@ -13,11 +13,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(nlohmann_json CONFIG QUIET)
-else()
-  find_package(nlohmann_json CONFIG QUIET)
-endif()
+find_package(nlohmann_json CONFIG QUIET)
 
 if(nlohmann_json_FOUND)
   if(NOT TARGET nlohmann_json::nlohmann_json AND TARGET nlohmann_json)
diff --git a/attachments/CMake/Findstb.cmake b/attachments/CMake/Findstb.cmake
@@ -12,20 +12,6 @@
 #    stb::stb
 #
 
-# Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(stb CONFIG QUIET)
-else()
-  find_package(stb CONFIG QUIET)
-endif()
-
-if(stb_FOUND)
-  if(NOT TARGET stb::stb AND TARGET stb)
-    add_library(stb::stb ALIAS stb)
-  endif()
-  return()
-endif()
-
 # Try to find the package using pkg-config first
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
@@ -81,7 +67,7 @@ endif()
 
 # Set the variables
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(stb
+find_package_handle_standard_args(stb 
   REQUIRED_VARS stb_INCLUDE_DIR
 )
 
@@ -97,4 +83,4 @@ if(stb_FOUND)
   endif()
 endif()
 
-mark_as_advanced(stb_INCLUDE_DIR)
+mark_as_advanced(stb_INCLUDE_DIR)
diff --git a/attachments/CMake/Findtinygltf.cmake b/attachments/CMake/Findtinygltf.cmake
@@ -13,11 +13,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(tinygltf CONFIG QUIET)
-else()
-  find_package(tinygltf CONFIG QUIET)
-endif()
+find_package(tinygltf CONFIG QUIET)
 
 if(tinygltf_FOUND)
   if(NOT TARGET tinygltf::tinygltf AND TARGET tinygltf)
@@ -27,11 +23,7 @@ if(tinygltf_FOUND)
 endif()
 
 # First, try to find nlohmann_json
-if(COMMAND _find_package)
-  _find_package(nlohmann_json QUIET)
-else()
-  find_package(nlohmann_json QUIET)
-endif()
+find_package(nlohmann_json QUIET)
 if(NOT nlohmann_json_FOUND)
   include(FetchContent)
   message(STATUS "nlohmann_json not found, fetching v3.12.0 from GitHub...")
diff --git a/attachments/CMake/Findtinyobjloader.cmake b/attachments/CMake/Findtinyobjloader.cmake
@@ -10,11 +10,7 @@
 #   tinyobjloader::tinyobjloader
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(tinyobjloader CONFIG QUIET)
-else()
-  find_package(tinyobjloader CONFIG QUIET)
-endif()
+find_package(tinyobjloader CONFIG QUIET)
 
 if(tinyobjloader_FOUND)
   if(NOT TARGET tinyobjloader::tinyobjloader AND TARGET tinyobjloader)
diff --git a/attachments/CMakeLists.txt b/attachments/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required (VERSION 3.29)
 
-list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-
 # vcpkg integration
 if(WIN32)
     # By default, we disable manifest mode to ensure compatibility with all vcpkg installations,
@@ -13,6 +11,8 @@ endif()
 
 project (VulkanTutorial)
 
+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)
 
diff --git a/attachments/simple_engine/CMake/FindKTX.cmake b/attachments/simple_engine/CMake/FindKTX.cmake
@@ -14,11 +14,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(ktx CONFIG QUIET)
-else()
-  find_package(ktx CONFIG QUIET)
-endif()
+find_package(ktx CONFIG QUIET)
 
 if(ktx_FOUND)
   if(NOT TARGET KTX::ktx AND TARGET ktx::ktx)
diff --git a/attachments/simple_engine/CMake/Findglm.cmake b/attachments/simple_engine/CMake/Findglm.cmake
@@ -13,11 +13,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(glm CONFIG QUIET)
-else()
-  find_package(glm CONFIG QUIET)
-endif()
+find_package(glm CONFIG QUIET)
 
 if(glm_FOUND)
   if(NOT TARGET glm::glm AND TARGET glm)
diff --git a/attachments/simple_engine/CMake/Findnlohmann_json.cmake b/attachments/simple_engine/CMake/Findnlohmann_json.cmake
@@ -13,11 +13,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(nlohmann_json CONFIG QUIET)
-else()
-  find_package(nlohmann_json CONFIG QUIET)
-endif()
+find_package(nlohmann_json CONFIG QUIET)
 
 if(nlohmann_json_FOUND)
   if(NOT TARGET nlohmann_json::nlohmann_json AND TARGET nlohmann_json)
diff --git a/attachments/simple_engine/CMake/Findstb.cmake b/attachments/simple_engine/CMake/Findstb.cmake
@@ -12,20 +12,6 @@
 #    stb::stb
 #
 
-# Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(stb CONFIG QUIET)
-else()
-  find_package(stb CONFIG QUIET)
-endif()
-
-if(stb_FOUND)
-  if(NOT TARGET stb::stb AND TARGET stb)
-    add_library(stb::stb ALIAS stb)
-  endif()
-  return()
-endif()
-
 # Try to find the package using pkg-config first
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
@@ -81,7 +67,7 @@ endif()
 
 # Set the variables
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(stb
+find_package_handle_standard_args(stb 
   REQUIRED_VARS stb_INCLUDE_DIR
 )
 
@@ -97,4 +83,4 @@ if(stb_FOUND)
   endif()
 endif()
 
-mark_as_advanced(stb_INCLUDE_DIR)
+mark_as_advanced(stb_INCLUDE_DIR)
diff --git a/attachments/simple_engine/CMake/Findtinygltf.cmake b/attachments/simple_engine/CMake/Findtinygltf.cmake
@@ -13,11 +13,7 @@
 #
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(tinygltf CONFIG QUIET)
-else()
-  find_package(tinygltf CONFIG QUIET)
-endif()
+find_package(tinygltf CONFIG QUIET)
 
 if(tinygltf_FOUND)
   if(NOT TARGET tinygltf::tinygltf AND TARGET tinygltf)
@@ -27,11 +23,7 @@ if(tinygltf_FOUND)
 endif()
 
 # First, try to find nlohmann_json
-if(COMMAND _find_package)
-  _find_package(nlohmann_json QUIET)
-else()
-  find_package(nlohmann_json QUIET)
-endif()
+find_package(nlohmann_json QUIET)
 if(NOT nlohmann_json_FOUND)
   include(FetchContent)
   message(STATUS "nlohmann_json not found, fetching v3.12.0 from GitHub...")
diff --git a/attachments/simple_engine/CMake/Findtinyobjloader.cmake b/attachments/simple_engine/CMake/Findtinyobjloader.cmake
@@ -10,11 +10,7 @@
 #   tinyobjloader::tinyobjloader
 
 # Try to find the package using CONFIG mode first (e.g., from vcpkg)
-if(COMMAND _find_package)
-  _find_package(tinyobjloader CONFIG QUIET)
-else()
-  find_package(tinyobjloader CONFIG QUIET)
-endif()
+find_package(tinyobjloader CONFIG QUIET)
 
 if(tinyobjloader_FOUND)
   if(NOT TARGET tinyobjloader::tinyobjloader AND TARGET tinyobjloader)
diff --git a/attachments/simple_engine/CMakeLists.txt b/attachments/simple_engine/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.29)
 
-list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-
 # vcpkg integration
 if(WIN32)
     # By default, we disable manifest mode to ensure compatibility with all vcpkg installations,
@@ -21,6 +19,9 @@ if(ENABLE_CPP20_MODULE)
     set(CMAKE_CXX_SCAN_FOR_MODULES ON)
 endif()
 
+# Add CMake module path for custom find modules
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
+
 # Find required packages
 find_package (glm REQUIRED)
 find_package (Vulkan REQUIRED)
diff --git a/vcpkg.json b/vcpkg.json
@@ -2,17 +2,13 @@
   "name": "vulkan-tutorial",
   "version": "1.0.0",
   "dependencies": [
-    { "name": "glfw3", "platform": "windows" },
-    { "name": "glm", "platform": "windows" },
-    { "name": "tinyobjloader", "platform": "windows" },
-    { "name": "stb", "platform": "windows" },
-    { "name": "tinygltf", "platform": "windows" },
-    { "name": "nlohmann-json", "platform": "windows" },
-    { "name": "openal-soft", "platform": "windows" },
-    {
-      "name": "ktx",
-      "platform": "windows",
-      "features": [ "vulkan" ]
-    }
+    "glfw3",
+    "glm",
+    "tinyobjloader",
+    "stb",
+    "tinygltf",
+    "nlohmann-json",
+    "openal-soft",
+    "ktx"
   ]
 }
