summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--ctrl/libhicnctrl/CMakeLists.txt2
-rw-r--r--ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt5
-rw-r--r--scripts/build-extras.sh5
-rw-r--r--scripts/build-packages.sh8
-rw-r--r--utils/CMakeLists.txt1
6 files changed, 12 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab764906f..0001a0a45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,10 +56,10 @@ list(APPEND dir_options
BUILD_LIBHICN
BUILD_HICNLIGHT
BUILD_HICNPLUGIN
+ BUILD_CTRL
BUILD_LIBTRANSPORT
BUILD_UTILS
BUILD_APPS
- BUILD_CTRL
BUILD_SYSREPOPLUGIN
BUILD_EXTRAS
)
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}
diff --git a/scripts/build-extras.sh b/scripts/build-extras.sh
index 9b768d55b..cbf2113ba 100644
--- a/scripts/build-extras.sh
+++ b/scripts/build-extras.sh
@@ -113,8 +113,6 @@ setup() {
echo ${DEPS_CENTOS} | xargs sudo yum install -y --nogpgcheck
sudo yum install devtoolset-7 pcre-devel
- c++ --version
-
CXX_COMPILER="/opt/rh/devtoolset-7/root/usr/bin/c++"
CC_COMPILER="/opt/rh/devtoolset-7/root/usr/bin/cc"
@@ -123,9 +121,6 @@ setup() {
export CC=${CC_COMPILER} CXX=${CXX_COMPILER}
fi
-
- # do nothing but check compiler version
- c++ --version
}
# Parameters:
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index 2205d6277..293b3df21 100644
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -40,6 +40,8 @@ DEPS_UBUNTU="libparc-dev \
libvppinfra=${VPP_VERSION_DEB} \
libvppinfra-dev=${VPP_VERSION_DEB} \
vpp-plugin-core=${VPP_VERSION_DEB} \
+ libyang \
+ sysrepo \
python3-ply"
DEPS_CMAKE_UBUNTU="curl"
@@ -54,6 +56,8 @@ DEPS_CENTOS="vpp-devel-${VPP_VERSION_RPM} \
asio-devel \
libconfig-devel \
centos-release-scl \
+ libyang \
+ sysrepo \
devtoolset-7"
DEPS_CENTOS_NOVERSION="vpp-devel \
@@ -174,12 +178,14 @@ build_package() {
cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_APPS=ON ${SCRIPT_PATH}/..
make -j8 package
- rm -rf libtransport ctrl/libctrl
+ rm -rf libtransport ctrl/libhicnctrl
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_HICNPLUGIN=ON \
-DBUILD_LIBTRANSPORT=ON \
-DBUILD_APPS=ON \
+ -DBUILD_HICNLIGHT=OFF \
+ -DBUILD_SYSREPOPLUGIN=ON \
${SCRIPT_PATH}/..
make -j8 package
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 3216582c2..d4458dc55 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -46,7 +46,6 @@ else()
endif()
set(SUFFIX "")
-message("~~~~~~~~~~~~~~~~~~~~~~> ${LIBTRANSPORT_LIBRARIES}")
if (${LIBTRANSPORT_LIBRARIES} MATCHES ".*-memif.*")
set(SUFFIX "-memif")
set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs")