diff options
| author | crupest <crupest@outlook.com> | 2021-04-20 16:19:24 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2021-04-20 16:19:24 +0800 |
| commit | b601fc68d3d2e1bff4574c6da54ba9e3991915d6 (patch) | |
| tree | 92cdf709c22f98b9ebb0d9bac1248db63e58b776 | |
| parent | b5f4d06abcb6464206d7c7d922484ac0980f2b9d (diff) | |
| download | life-b601fc68d3d2e1bff4574c6da54ba9e3991915d6.tar.gz life-b601fc68d3d2e1bff4574c6da54ba9e3991915d6.tar.bz2 life-b601fc68d3d2e1bff4574c6da54ba9e3991915d6.zip | |
...
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | cpp-practicum/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cpp-practicum/vcpkg.json | 7 | ||||
| m--------- | vcpkg | 0 |
4 files changed, 10 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3c19d8d..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vcpkg"] - path = vcpkg - url = https://github.com/Microsoft/vcpkg diff --git a/cpp-practicum/CMakeLists.txt b/cpp-practicum/CMakeLists.txt index 7958850..346fdb4 100644 --- a/cpp-practicum/CMakeLists.txt +++ b/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/cpp-practicum/vcpkg.json b/cpp-practicum/vcpkg.json new file mode 100644 index 0000000..cb907c5 --- /dev/null +++ b/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/vcpkg b/vcpkg deleted file mode 160000 -Subproject 389efb2701e93d0474fab8f8705f2f85a77e426 |