diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-12-11 16:05:28 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-12-11 18:44:27 +0000 |
| commit | 631e07d8a53e77370da5e0273ddfc66789de867d (patch) | |
| tree | 861f05c35f2bd5cd65be09762d1770c97e873112 /ctrl | |
| parent | 0c9c060ab9e4fc3bc124f76edda4be194d5ce21c (diff) | |
[HICN-449] [HICN-430] Build sysrepo plugin. Update sysrepo and libyang dependencies for centos.
Change-Id: I92afec16346929e101e57466d5621e4ebe4dc4d2
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'ctrl')
| -rw-r--r-- | ctrl/libhicnctrl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ctrl/libhicnctrl/CMakeLists.txt b/ctrl/libhicnctrl/CMakeLists.txt index d0a4bbef3..ff586ff22 100644 --- a/ctrl/libhicnctrl/CMakeLists.txt +++ b/ctrl/libhicnctrl/CMakeLists.txt @@ -37,7 +37,7 @@ set(CMAKE_MACOSX_RPATH ON) set(LIBHICNCTRL hicnctrl) if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - set(LIBHICNCTRL ${LIBHICNCTRL}-memif PARENT_SCOPE) + set(LIBHICNCTRL ${LIBHICNCTRL}-memif) set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs") list(APPEND HICN_LIBRARIES ${HICNPLUGIN_LIBRARIES}) endif() diff --git a/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt b/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt index 34dbdb817..d5b15f21a 100644 --- a/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt +++ b/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt @@ -30,7 +30,8 @@ set(SOURCE_FILES list(APPEND SYSREPO_PLUGIN_INCLUDE_DIRS ${VPP_INCLUDE_DIRS} - ${HICNPLUGIN_INCLUDE_DIRS}) + ${HICNPLUGIN_INCLUDE_DIRS} +) list(APPEND LIBRARIES ${SYSREPO_LIBRARIES} @@ -41,7 +42,7 @@ build_library(sysrepohicn SOURCES ${SOURCE_FILES} LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} - COMPONENT hicn_sysrepo_plugin + COMPONENT hicn-sysrepo-plugin INCLUDE_DIRS ${SYSREPO_PLUGIN_INCLUDE_DIRS} INSTALL_FULL_PATH_DIR ${SRPD_PLUGINS_PATH} DEFINITIONS ${COMPILER_DEFINITIONS} |