From 4479fc6a80736e78cca974142f9e8d3f66cbf291 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 20 Apr 2021 16:19:24 +0800 Subject: import(life): ... --- works/life/.gitmodules | 3 --- works/life/cpp-practicum/CMakeLists.txt | 6 +++--- works/life/cpp-practicum/vcpkg.json | 7 +++++++ works/life/vcpkg | 1 - 4 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 works/life/.gitmodules create mode 100644 works/life/cpp-practicum/vcpkg.json delete mode 160000 works/life/vcpkg (limited to 'works') 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 index 389efb2..0000000 --- a/works/life/vcpkg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 389efb2701e93d0474fab8f8705f2f85a77e4262 -- cgit v1.2.3