From 8743874ffe46ac19bb5dbeeb06f200572329f4b2 Mon Sep 17 00:00:00 2001 From: Skyth <19259897+blueskythlikesclouds@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:35:26 +0300 Subject: [PATCH] Remove vcpkg submodule. --- .gitmodules | 3 --- CMakeLists.txt | 2 +- CMakeSettings.json | 16 ++++++++++++++-- vcpkg | 1 - 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 .gitmodules delete mode 160000 vcpkg diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index fe07c99..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vcpkg"] - path = vcpkg - url = https://github.com/microsoft/vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index db7508b..4077bde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.29) -include(vcpkg/scripts/buildsystems/vcpkg.cmake) +include($ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake) set(CMAKE_CXX_STANDARD 23) project(ShaderRecomp-ALL) diff --git a/CMakeSettings.json b/CMakeSettings.json index 5b03594..2aafbad 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -10,7 +10,13 @@ "buildCommandArgs": "", "ctestCommandArgs": "", "inheritEnvironments": [ "clang_cl_x64_x64" ], - "variables": [] + "variables": [ + { + "name": "VCPKG_TARGET_TRIPLET", + "value": "x64-windows", + "type": "STRING" + } + ] }, { "name": "x64-Clang-Release", @@ -22,7 +28,13 @@ "buildCommandArgs": "", "ctestCommandArgs": "", "inheritEnvironments": [ "clang_cl_x64_x64" ], - "variables": [] + "variables": [ + { + "name": "VCPKG_TARGET_TRIPLET", + "value": "x64-windows", + "type": "STRING" + } + ] } ] } \ No newline at end of file diff --git a/vcpkg b/vcpkg deleted file mode 160000 index e63bd09..0000000 --- a/vcpkg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e63bd09dc0b7204467705c1c7c71d0e2a3f8860b