From 159995f48657a6491cfcd3ab411cb2577d71e06b Mon Sep 17 00:00:00 2001 From: Remy Prechelt <prechelt@hawaii.edu> Date: Wed, 27 Jan 2021 23:59:03 -1000 Subject: [PATCH] Add yaml-cpp and arrow as dependencies via conan/submodules. --- .gitmodules | 6 +++++- conanfile.txt | 1 + externals/arrow | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 externals/arrow diff --git a/.gitmodules b/.gitmodules index 1bbe5d4d0..507cc5179 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,4 +12,8 @@ path = modules/conex url = ../../AirShowerPhysics/cxroot.git branch = master - shallow = true + shallow = true +[submodule "externals/arrow"] + path = externals/arrow + url = https://github.com/apache/arrow + shallow = true diff --git a/conanfile.txt b/conanfile.txt index 85c1238b4..830af8eaa 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -4,6 +4,7 @@ catch2/2.13.3 eigen/3.3.8 boost/1.74.0 zlib/1.2.11 +yaml-cpp/0.6.3 [generators] cmake diff --git a/externals/arrow b/externals/arrow new file mode 160000 index 000000000..d613aa687 --- /dev/null +++ b/externals/arrow @@ -0,0 +1 @@ +Subproject commit d613aa68789288d3503dfbd8376a41f2d28b6c9d -- GitLab