aboutsummaryrefslogtreecommitdiff
path: root/works/life
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2021-04-20 16:19:24 +0800
committercrupest <crupest@outlook.com>2021-04-20 16:19:24 +0800
commit4479fc6a80736e78cca974142f9e8d3f66cbf291 (patch)
tree2a1a0cb1b8260eadeb3d84bd13638ad2b326f52d /works/life
parent1fce8d95ac8609f716e953af3954c2a537e64c97 (diff)
downloadcrupest-4479fc6a80736e78cca974142f9e8d3f66cbf291.tar.gz
crupest-4479fc6a80736e78cca974142f9e8d3f66cbf291.tar.bz2
crupest-4479fc6a80736e78cca974142f9e8d3f66cbf291.zip
import(life): ...
Diffstat (limited to 'works/life')
-rw-r--r--works/life/.gitmodules3
-rw-r--r--works/life/cpp-practicum/CMakeLists.txt6
-rw-r--r--works/life/cpp-practicum/vcpkg.json7
m---------works/life/vcpkg0
4 files changed, 10 insertions, 6 deletions
diff --git a/works/life/.gitmodules b/works/life/.gitmodules
deleted file mode 100644
index 3c19d8d..0000000
--- a/works/life/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vcpkg"]
- path = vcpkg
- url = https://github.com/Microsoft/vcpkg
diff --git a/works/life/cpp-practicum/CMakeLists.txt b/works/life/cpp-practicum/CMakeLists.txt
index 7958850..346fdb4 100644
--- a/works/life/cpp-practicum/CMakeLists.txt
+++ b/works/life/cpp-practicum/CMakeLists.txt
@@ -1,8 +1,8 @@
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../vcpkg/scripts/buildsystems/vcpkg.cmake
- CACHE STRING "Vcpkg toolchain file")
-
cmake_minimum_required(VERSION 3.14)
+set(CMAKE_TOOLCHAIN_FILE $ENV{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake
+ CACHE STRING "Vcpkg toolchain file")
+
project(CppPraticum)
enable_testing()
diff --git a/works/life/cpp-practicum/vcpkg.json b/works/life/cpp-practicum/vcpkg.json
new file mode 100644
index 0000000..cb907c5
--- /dev/null
+++ b/works/life/cpp-practicum/vcpkg.json
@@ -0,0 +1,7 @@
+{
+ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
+ "name": "cpp-praticum",
+ "version": "0.0.1",
+ "dependencies": ["ms-gsl", "qt5"]
+ }
+ \ No newline at end of file
diff --git a/works/life/vcpkg b/works/life/vcpkg
deleted file mode 160000
-Subproject 389efb2701e93d0474fab8f8705f2f85a77e426