From acc0fca28a82be5fbac025b40ea95c156bde590f Mon Sep 17 00:00:00 2001 From: Joscha Schmiedt <joscha@schmiedt.dev> Date: Fri, 9 Aug 2024 20:11:11 +0200 Subject: [PATCH] Add vcpkg submodule --- .gitmodules | 3 +++ CMakeLists.txt | 3 +++ vcpkg | 1 + 3 files changed, 7 insertions(+) create mode 160000 vcpkg diff --git a/.gitmodules b/.gitmodules index 80d822f..f937552 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "proto"] path = proto url = ../caosdb-proto.git +[submodule "vcpkg"] + path = vcpkg + url = https://github.com/microsoft/vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index eb566f0..2975794 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,9 @@ cmake_minimum_required(VERSION 3.13) +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") + set(libcaosdb_VERSION 0.3.0) set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0) set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 9) diff --git a/vcpkg b/vcpkg new file mode 160000 index 0000000..8ae59b5 --- /dev/null +++ b/vcpkg @@ -0,0 +1 @@ +Subproject commit 8ae59b5b1329a51875abc71d528da93d9c3e8972 -- GitLab