diff options
| author |   drenfong.wang <drenfong.wang@intel.com> | 2019-02-20 08:40:55 +0000 |
|---|---|---|
| committer | drenfong.wang <drenfong.wang@intel.com> | 2019-02-20 08:40:55 +0000 |
| commit | 06ca5af1c5efca1d14307c5f868ac7401d41cb2e (patch) | |
| tree | 5baedea187cff5e5b68fa9457f11a45ee83c9178 | |
| parent | 0a40cddc640afd57b50b7d53ca572d4c5655f464 (diff) | |
fix package cannot run
Change-Id: Ia5adb89d63cc233d7356d06e02db71459683cdcd
Signed-off-by: drenfong.wang <drenfong.wang@intel.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | src/plugins/CMakeLists.txt | 8 |
2 files changed, 3 insertions, 6 deletions
@@ -200,6 +200,7 @@ build-plugins: @mkdir -p $(BR)/build-plugins/;cd $(BR)/build-plugins/;cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr $(WS_ROOT)/src/plugins/;make install; build-package: + @mkdir -p $(BR)/build-scvpp/;cd $(BR)/build-scvpp;cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr $(WS_ROOT)/src/scvpp/;make install; @mkdir -p $(BR)/build-package/;cd $(BR)/build-package/;$(cmake) $(WS_ROOT)/src/;make package;rm -rf $(BR)/build-package/_CPack_Packages; clean: @cd $(BR)/build-scvpp && make clean; 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}) |