Skip to content

Commit

Permalink
Switch to recommended vcpkg setup
Browse files Browse the repository at this point in the history
Vcpkg now lives inside a submodule instead of expecting it to be present
on the target system, as recommended by their documentation.

Also fixes #26.
  • Loading branch information
OrfeasZ committed Nov 16, 2022
1 parent bc8862a commit f5b6f22
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "External/mINI"]
path = External/mINI
url = https://github.com/pulzed/mINI.git
[submodule "External/vcpkg"]
path = External/vcpkg
url = https://github.com/microsoft/vcpkg.git
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"DIRECTX_ARCH": "x64",
"CMAKE_CXX_COMPILER": "cl.exe",
"CMAKE_TOOLCHAIN_FILE": {
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"value": "${sourceDir}/External/vcpkg/scripts/buildsystems/vcpkg.cmake",
"type": "FILEPATH"
},
"VCPKG_TARGET_TRIPLET": "x64-windows",
Expand Down
1 change: 1 addition & 0 deletions External/vcpkg
Submodule vcpkg added at 6f7ffe

0 comments on commit f5b6f22

Please sign in to comment.