Skip to content

Commit 4b91358

Browse files
committed
Revert "Switch from vcpkg manifest mode to classic mode and disable manifest mode by default on Windows"
This reverts commit df8f35e.
1 parent 6e9f0f0 commit 4b91358

5 files changed

Lines changed: 18 additions & 23 deletions

File tree

attachments/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
cmake_minimum_required (VERSION 3.29)
22

3-
# vcpkg integration
4-
if(WIN32)
5-
# By default, we disable manifest mode to ensure compatibility with all vcpkg installations,
6-
# including those from standalone packages and Visual Studio which may not have git or a baseline.
7-
if(NOT DEFINED VCPKG_MANIFEST_MODE)
8-
set(VCPKG_MANIFEST_MODE OFF CACHE BOOL "Use vcpkg manifest mode")
9-
endif()
10-
endif()
11-
123
project (VulkanTutorial)
134

145
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")

attachments/simple_engine/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
cmake_minimum_required(VERSION 3.29)
22

3-
# vcpkg integration
4-
if(WIN32)
5-
# By default, we disable manifest mode to ensure compatibility with all vcpkg installations,
6-
# including those from standalone packages and Visual Studio which may not have git or a baseline.
7-
if(NOT DEFINED VCPKG_MANIFEST_MODE)
8-
set(VCPKG_MANIFEST_MODE OFF CACHE BOOL "Use vcpkg manifest mode")
9-
endif()
10-
endif()
11-
123
project(SimpleEngine VERSION 1.0.0 LANGUAGES CXX C)
134

145
# Option to enable/disable Vulkan C++20 module support for this standalone project

attachments/simple_engine/install_dependencies_windows.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ set VCPKG_BINARY_SOURCES=clear;files,%TEMP%\vcpkg-cache,readwrite
2424
:: Create cache directory if it doesn't exist
2525
if not exist %TEMP%\vcpkg-cache mkdir %TEMP%\vcpkg-cache
2626

27-
:: Install all dependencies at once using vcpkg in classic mode
27+
:: Install all dependencies at once using vcpkg with parallel installation
2828
echo Installing all dependencies...
29-
vcpkg install glfw3 glm tinyobjloader stb tinygltf nlohmann-json ktx[vulkan] openal-soft --triplet=x64-windows
29+
vcpkg install --triplet=x64-windows --x-manifest-root=%~dp0 --feature-flags=binarycaching,manifests --x-install-root=%VCPKG_INSTALLATION_ROOT%/installed
3030

3131
:: Remind about Vulkan SDK
3232
echo.

scripts/install_dependencies_windows.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ set VCPKG_BINARY_SOURCES=clear;files,%TEMP%\vcpkg-cache,readwrite
2121
:: Create cache directory if it doesn't exist
2222
if not exist %TEMP%\vcpkg-cache mkdir %TEMP%\vcpkg-cache
2323

24-
:: Install all dependencies at once using vcpkg in classic mode
24+
:: Install all dependencies at once using vcpkg with parallel installation
2525
echo Installing all dependencies...
26-
vcpkg install glfw3 glm tinyobjloader stb tinygltf nlohmann-json ktx[vulkan] openal-soft --triplet=x64-windows
26+
vcpkg install --triplet=x64-windows --x-manifest-root=%~dp0\.. --feature-flags=binarycaching,manifests --x-install-root=%VCPKG_INSTALLATION_ROOT%/installed
2727

2828
:: Remind about Vulkan SDK
2929
echo.
@@ -34,7 +34,7 @@ echo All dependencies have been installed successfully!
3434
echo You can now use CMake to build your Vulkan project.
3535
echo.
3636
echo Example CMake command:
37-
echo cmake -B build -S attachments -DCMAKE_TOOLCHAIN_FILE=[path\to\vcpkg]\scripts\buildsystems\vcpkg.cmake
37+
echo cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=[path\to\vcpkg]\scripts\buildsystems\vcpkg.cmake
3838
echo cmake --build build
3939

4040
exit /b 0

scripts/vcpkg.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "vulkan-tutorial",
3+
"version": "1.0.0",
4+
"dependencies": [
5+
"glfw3",
6+
"glm",
7+
"tinyobjloader",
8+
"stb",
9+
"tinygltf",
10+
"nlohmann-json",
11+
"ktx"
12+
]
13+
}

0 commit comments

Comments
 (0)