Skip to content

Commit d13396a

Browse files
committed
Use vcpkg from submodule instead
1 parent d244c7c commit d13396a

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ jobs:
5353
--config ${{matrix.config}} `
5454
--parallel `
5555
-- `
56-
/p:CL_MPCount=
56+
/p:CL_MPCount= `
57+
-DVCPKG_TARGET_TRIPLET=x64-windows-static
5758
$version="$(Get-Content version.txt)"
5859
Add-Content $Env:GITHUB_OUTPUT "VERSION=${version}"
5960
- name: Install debug symbols

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "third-party/vcpkg"]
2+
path = third-party/vcpkg
3+
url = https://github.com/microsoft/vcpkg.git

CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,9 @@ if ("${VCPKG_TARGET_TRIPLET}" MATCHES "-static$")
5555
add_link_options("${COMMON_LINK_OPTIONS}")
5656
endif()
5757

58-
if ("$ENV{VCPKG_ROOT}")
59-
set(VCPKG_ROOT "$ENV{VCPKG_ROOT}")
60-
else()
61-
set(VCPKG_ROOT "$ENV{VCPKG_INSTALLATION_ROOT}")
62-
endif()
63-
6458
set(
6559
CMAKE_TOOLCHAIN_FILE
66-
"${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
60+
"${CMAKE_SOURCE_DIR}/third-party/vcpkg/scripts/buildsystems/vcpkg.cmake"
6761
CACHE STRING "Vcpkg toolchain file"
6862
)
6963

third-party/vcpkg

Submodule vcpkg added at b2cb0da

0 commit comments

Comments
 (0)