summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-12-11 19:37:19 +0100
committerMauro Sardara <msardara@cisco.com>2019-12-11 19:37:19 +0100
commit0c9c060ab9e4fc3bc124f76edda4be194d5ce21c (patch)
tree3d8a1a8e7cbaedfcea8beff160d7986c37cd512b
parent6ebfd6a44209de4960f806cf7986539fa4c4f286 (diff)
[HICN-430] Build sysrepo and libyang extra with correct dependencies
Change-Id: Icc758938acac76a407d3a6d37a4896c331e47380 Signed-off-by: Mauro Sardara <msardara@cisco.com>
-rw-r--r--cmake/Modules/Packager.cmake2
-rw-r--r--extras/CMakeLists.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake
index 03e78959b..5e77d7de0 100644
--- a/cmake/Modules/Packager.cmake
+++ b/cmake/Modules/Packager.cmake
@@ -50,7 +50,7 @@ macro(extract_version)
)
if (NOT VER)
- set(VER "v1.1-0-gcafe")
+ set(VER "v1.2-0-gcafe")
endif()
message(STATUS "Git describe output: ${VER}")
diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt
index 71a598326..6629f3809 100644
--- a/extras/CMakeLists.txt
+++ b/extras/CMakeLists.txt
@@ -21,8 +21,8 @@ list(APPEND CMAKE_MODULE_PATH
set (DESTDIR ${CMAKE_BINARY_DIR}/extras-root)
-add_subdirectory(router-plugin)
-add_subdirectory(libmemif)
+# add_subdirectory(router-plugin)
+# add_subdirectory(libmemif)
add_subdirectory(libyang)
add_subdirectory(sysrepo)