diff options
| author |   drenfong.wang <drenfong.wang@intel.com> | 2019-02-20 08:47:40 +0000 |
|---|---|---|
| committer | drenfong.wang <drenfong.wang@intel.com> | 2019-02-20 08:47:40 +0000 |
| commit | 029bcf3fc1f192fe9b56a0e89a5117c676f69566 (patch) | |
| tree | b32a91691c7766e02643ff99946b83ce533fdce5 | |
| parent | 28420342fc1d6dd66ed91f1483261b44e3dcd02a (diff) | |
fix package run error
Change-Id: I5eb02817ad0b25649f89bfd2d8df022665baf064
Signed-off-by: drenfong.wang <drenfong.wang@intel.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/plugins/CMakeLists.txt | 6 |
2 files changed, 3 insertions, 6 deletions
@@ -200,7 +200,8 @@ 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-package/;cd $(BR)/build-package/;$(cmake) $(WS_ROOT)/src/;make package;rm -rf $(BR)/build-package/_CPack_Packages + @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 ae7bb68..23c120f 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) @@ -50,8 +50,6 @@ set(BAPI_SRC add_library(bapi SHARED ${BAPI_SRC}) target_include_directories(bapi PUBLIC ${VPP_INCLUDE_DIRS} ./bapi) -ADD_DEPENDENCIES(bapi scvpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../scvpp/src) target_link_libraries(bapi ${VPP_LIBRARIES}) # plugins sources @@ -66,8 +64,6 @@ 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} ${SCVPP_LIBRARIES} bapi) # install the plugin into plugins dir |