From fa11d711aaab5e4cba7e89dcc896866f3e73db3f Mon Sep 17 00:00:00 2001
From: Aberto Compagno <acompagn+fdio@cisco.com>
Date: Wed, 29 Jan 2020 15:52:45 +0000
Subject: [HICN-491] Fixed missing inclusion of vapi_safe into the hicn-plugin
 deb/rpm  package

Signed-off-by: Aberto Compagno <acompagn+fdio@cisco.com>
Change-Id: Iec88cca235395754829fedf029add5fa779d5a9e
---
 hicn-plugin/CMakeLists.txt      | 24 ++++++++++++++++++++++++
 hicn-plugin/src/CMakeLists.txt  | 25 ++-----------------------
 hicn-plugin/vapi/CMakeLists.txt | 10 ----------
 3 files changed, 26 insertions(+), 33 deletions(-)

(limited to 'hicn-plugin')

diff --git a/hicn-plugin/CMakeLists.txt b/hicn-plugin/CMakeLists.txt
index d0781e8fa..038426838 100644
--- a/hicn-plugin/CMakeLists.txt
+++ b/hicn-plugin/CMakeLists.txt
@@ -13,6 +13,30 @@
 
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
+project(hicn-plugin)
+
+include(GNUInstallDirs)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/"
+)
+include(BuildMacros)
+
+set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_C_STANDARD 11)
+
+# Check for memfd_create syscall
+include(CheckSymbolExists)
+CHECK_SYMBOL_EXISTS ( "__NR_memfd_create" "sys/syscall.h" HAVE_MEMFD_CREATE )
+if ( HAVE_MEMFD_CREATE )
+    add_definitions ( -DHAVE_MEMFD_CREATE )
+endif()
+
+set(HICN_PLUGIN hicn-plugin CACHE INTERNAL "" FORCE)
+
+include (Packaging)
+
 add_subdirectory(src)
 
 add_subdirectory(vapi)
\ No newline at end of file
diff --git a/hicn-plugin/src/CMakeLists.txt b/hicn-plugin/src/CMakeLists.txt
index 0f2debcb9..3e9b8f6d1 100644
--- a/hicn-plugin/src/CMakeLists.txt
+++ b/hicn-plugin/src/CMakeLists.txt
@@ -12,29 +12,6 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-project(hicn-plugin)
-
-include(GNUInstallDirs)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Modules/"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/"
-)
-include(BuildMacros)
-
-set (CMAKE_CXX_STANDARD 11)
-set (CMAKE_C_STANDARD 11)
-
-# Check for memfd_create syscall
-include(CheckSymbolExists)
-CHECK_SYMBOL_EXISTS ( "__NR_memfd_create" "sys/syscall.h" HAVE_MEMFD_CREATE )
-if ( HAVE_MEMFD_CREATE )
-    add_definitions ( -DHAVE_MEMFD_CREATE )
-endif()
-
-set(${HICN_PLUGIN}-dev hicn-plugin CACHE INTERNAL "" FORCE SCOPE PARENT)
-
-include (Packaging)
 
 # Dependencies
 
@@ -283,6 +260,8 @@ set_target_properties(hicn_api_test_plugin
         LINKER_LANGUAGE C
         PREFIX "")
 
+message (STATUS "hicn-plugin variable ${HICN_PLUGIN}")
+
 install(DIRECTORY
         DESTINATION ${VPP_INSTALL_PLUGIN}
         COMPONENT ${HICN_PLUGIN})
diff --git a/hicn-plugin/vapi/CMakeLists.txt b/hicn-plugin/vapi/CMakeLists.txt
index 4b33cd258..03fd489ca 100644
--- a/hicn-plugin/vapi/CMakeLists.txt
+++ b/hicn-plugin/vapi/CMakeLists.txt
@@ -16,16 +16,6 @@ set(SAFE_VAPI safe_vapi CACHE INTERNAL "" FORCE)
 set(SAFE_VAPI_SHARED ${SAFE_VAPI}.shared CACHE INTERNAL "" FORCE)
 set(SAFE_VAPI_STATIC ${SAFE_VAPI}.static CACHE INTERNAL "" FORCE)
 
-project(${SAFE_VAPI})
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Modules/"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/"
-)
-
-include (Packaging)
-include (BuildMacros)
-
 # Dependencies
 
 find_package(Vpp REQUIRED)
-- 
cgit 1.2.3-korg