commit c30a1b8ffe874b202e5ae84920cc2f2636457867
author Václav Kubernát <kubervac@fit.cvut.cz> Fri Jun 15 12:55:27 2018 +0200
committer Gerrit Code Review <gerrit@gerrit.cesnet.cz> Fri Jun 15 12:55:27 2018 +0200
tree 3077d728b7b8e1ad40f035e6c238c886db7d6719
parent bddbb177b8c348c22349d7e4778ab4db208e8724
parent e05448ad09c0bbf8aa61c339be84a378317e2163

Merge "Build with libyang"

.gitmodules

diff --git a/.gitmodules b/.gitmodules
index 00eeb89..5e10dfb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "submodules/boost"]
 	path = submodules/boost
 	url = ../../github/boostorg/boost
+[submodule "submodules/libyang"]
+	path = submodules/libyang
+	url = ../../github/CESNET/libyang

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b3e0a1..cae063a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,9 @@
 find_package(spdlog REQUIRED)
 find_package(Boost REQUIRED)
 
+find_package(PkgConfig)
+pkg_check_modules(LIBYANG REQUIRED libyang-cpp>=0.15.111)
+
 # we don't need filename tracking, and we prefer to use header-only Boost
 add_definitions(-DBOOST_SPIRIT_X3_NO_FILESYSTEM)
 

ci/do-build.sh

diff --git a/ci/do-build.sh b/ci/do-build.sh
index a7177ac..ab6a105 100755
--- a/ci/do-build.sh
+++ b/ci/do-build.sh
@@ -76,6 +76,9 @@
     cp -LR boost ${PREFIX}/include/
     popd
 
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF" emerge_dep libyang
+    do_test_dep_cmake libyang -j${CI_PARALLEL_JOBS}
+
     tar -C ~/target -cvJf ${TH_JOB_WORKING_DIR}/${ARTIFACT} .
     ssh th-ci-logs@ci-logs.gerrit.cesnet.cz mkdir -p artifacts/${TH_JOB_NAME} \
         || true # ignore network errors

submodules/libyang

diff --git a/submodules/libyang b/submodules/libyang
new file mode 160000
index 0000000..46ba580
--- /dev/null
+++ b/submodules/libyang
@@ -0,0 +1 @@
+Subproject commit 46ba5802b70b6cf1e9dfb03140065d6c9cd57c8b