From 06ca5af1c5efca1d14307c5f868ac7401d41cb2e Mon Sep 17 00:00:00 2001 From: "drenfong.wang" Date: Wed, 20 Feb 2019 08:40:55 +0000 Subject: fix package cannot run Change-Id: Ia5adb89d63cc233d7356d06e02db71459683cdcd Signed-off-by: drenfong.wang --- src/plugins/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index ae363e0..08003f7 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -29,7 +29,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake") find_package(VPP) find_package(PkgConfig) pkg_check_modules(SYSREPO REQUIRED libsysrepo) -#pkg_check_modules(SCVPP REQUIRED libscvpp) +pkg_check_modules(SCVPP REQUIRED libscvpp) # get sysrepo plugins directory from pkgconfig if (NOT SR_PLUGINS_DIR) @@ -48,8 +48,6 @@ set(BAPI_SRC ./bapi/bapi_ip.c ) add_library(bapi SHARED ${BAPI_SRC}) -ADD_DEPENDENCIES(bapi scvpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../scvpp/src) target_include_directories(bapi PUBLIC ${VPP_INCLUDE_DIRS} ./bapi) target_link_libraries(bapi ${VPP_LIBRARIES}) @@ -66,9 +64,7 @@ set(PLUGINS_SOURCES # build the source code into shared library add_library(vpp-plugins SHARED ${PLUGINS_SOURCES}) -ADD_DEPENDENCIES(vpp-plugins scvpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../scvpp/src) -target_link_libraries(vpp-plugins ${SYSREPO_LIBRARIES} bapi) +target_link_libraries(vpp-plugins ${SYSREPO_LIBRARIES} ${SCVPP_LIBRARIES} bapi) # install the plugin into plugins dir install(TARGETS vpp-plugins DESTINATION ${SR_PLUGINS_DIR}) -- cgit 1.2.3-korg