1 files changed, 42 insertions, 27 deletions

diff --git a/ctrl/libhicnctrl/src/modules/CMakeLists.txt b/ctrl/libhicnctrl/src/modules/CMakeLists.txt
index e07ab8c99..8f7916d14 100644
--- a/ctrl/libhicnctrl/src/modules/CMakeLists.txt
+++ b/ctrl/libhicnctrl/src/modules/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2021-2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -11,38 +11,53 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-
-list(APPEND HICNLIGHT_MODULE_SOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/hicn_light_api.c
+##############################################################
+# Hicn Light NG Module
+##############################################################
+list(APPEND HICNLIGHTNG_MODULE_SOURCE_FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/hicn_light_common.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/hicn_light_ng_api.c
 )
 
-build_module(hicnlightctrl_module
-    SHARED
-    SOURCES ${HICNLIGHT_MODULE_SOURCE_FILES}
-    DEPENDS ${DEPENDENCIES}
-    COMPONENT ${LIBHICNCTRL_COMPONENT}
-    INCLUDE_DIRS ${INCLUDE_DIRS}
-    DEFINITIONS ${COMPILER_DEFINITIONS}
-    COMPILE_OPTIONS ${COMPILE_FLAGS}
+build_module(hicnlightngctrl_module
+  SOURCES ${HICNLIGHTNG_MODULE_SOURCE_FILES}
+  DEPENDS ${DEPENDENCIES}
+  COMPONENT ${LIBHICNCTRL_COMPONENT}
+  LINK_LIBRARIES PRIVATE ${HICN_LIBRARIES}
+  INCLUDE_DIRS PRIVATE ${INCLUDE_DIRS}
+  DEFINITIONS PRIVATE ${COMPILER_DEFINITIONS}
+  COMPILE_OPTIONS PRIVATE ${COMPILE_FLAGS}
+  COMPILE_OPTIONS ${COMPILER_OPTIONS}
 )
 
+
+##############################################################
+# VPP Module
+##############################################################
 if(BUILD_HICNPLUGIN AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  list(APPEND HICNLIGHT_PLUGIN_SOURCE_FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/hicn_plugin_api.c
+  if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+    find_package(HicnPlugin ${CURRENT_VERSION} REQUIRED)
+    find_package(Safevapi ${CURRENT_VERSION} REQUIRED)
+  else()
+    list(APPEND DEPENDENCIES
+      ${SAFE_VAPI_SHARED}
+    )
+  endif()
+
+  list(APPEND HICN_PLUGIN_SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/hicn_plugin_api.c
   )
 
   build_module(vppctrl_module
-      SHARED
-      SOURCES ${HICNLIGHT_PLUGIN_SOURCE_FILES}
-      DEPENDS ${DEPENDENCIES}
-      LINK_LIBRARIES ${HICNPLUGIN_LIBRARIES} ${SAFE_VAPI_LIBRARIES}
-      COMPONENT ${LIBHICNCTRL_COMPONENT_MODULES}
-      INCLUDE_DIRS ${INCLUDE_DIRS}
-      DEFINITIONS ${COMPILER_DEFINITIONS}
-      COMPILE_OPTIONS ${COMPILE_FLAGS}
-      LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs"
+    SOURCES ${HICN_PLUGIN_SOURCE_FILES}
+    DEPENDS ${DEPENDENCIES}
+    LINK_LIBRARIES
+      PRIVATE ${HICN_LIBRARIES}
+      PRIVATE ${HICNPLUGIN_LIBRARIES}
+      PRIVATE ${SAFE_VAPI_LIBRARIES}
+    COMPONENT ${LIBHICNCTRL_COMPONENT_MODULES}
+    INCLUDE_DIRS PRIVATE ${INCLUDE_DIRS}
+    DEFINITIONS PRIVATE ${COMPILER_DEFINITIONS}
+    COMPILE_OPTIONS ${COMPILER_OPTIONS} ${MARCH_COMPILER_OPTIONS}
   )
-
-endif()
\ No newline at end of file
+endif()