1 files changed, 46 insertions, 22 deletions

diff --git a/telemetry/vpp-collectd/vpp/CMakeLists.txt b/telemetry/vpp-collectd/vpp/CMakeLists.txt
index c36787355..e1cf55553 100644
--- a/telemetry/vpp-collectd/vpp/CMakeLists.txt
+++ b/telemetry/vpp-collectd/vpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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,29 +11,53 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Dependencies
-find_package(Vpp REQUIRED)
-find_package(Collectd REQUIRED)
-
+##############################################################
+# Sources
+##############################################################
 list(APPEND SOURCE_FILES
-     ${CMAKE_CURRENT_SOURCE_DIR}/vpp.c)
+  ${CMAKE_CURRENT_SOURCE_DIR}/vpp.c
+)
+
 
+##############################################################
+# Include dirs
+##############################################################
 list(APPEND INCLUDE_DIRS
-    ${COLLECTD_INCLUDE_DIRS}
-    ${VPP_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    "${CMAKE_CURRENT_SOURCE_DIR}/../common")
+  ${COLLECTD_INCLUDE_DIRS}
+  ${THIRD_PARTY_INCLUDE_DIRS}
+  ${VPP_INCLUDE_DIRS}
+)
 
+
+##############################################################
+# Libraries
+##############################################################
 list(APPEND LIBRARIES
-    ${VPP_LIBRARY_VPPAPICLIENT}
-    ${VPP_LIBRARY_INFRA})
-
-build_library(vpp
-    SHARED
-    SOURCES ${SOURCE_FILES}
-    LINK_LIBRARIES ${LIBRARIES}
-    INCLUDE_DIRS ${INCLUDE_DIRS}
-    INSTALL_FULL_PATH_DIR ${CMAKE_INSTALL_PREFIX}/lib/collectd
-    COMPONENT ${COLLECTD_PLUGINS}
-    EMPTY_PREFIX true
-  )
+  ${VPP_LIBRARY_VPPAPICLIENT}
+  ${VPP_LIBRARY_INFRA}
+)
+
+
+##############################################################
+# Compiler options
+##############################################################
+list(APPEND COMPILER_OPTIONS
+  ${DEFAULT_COMPILER_OPTIONS}
+  ${COLLECTD_COMPILER_OPTIONS}
+)
+
+
+##############################################################
+# Build library
+##############################################################
+build_library(${VPP_TELEMETRY}
+  SHARED
+  EMPTY_PREFIX
+  SOURCES ${SOURCE_FILES}
+  LINK_LIBRARIES ${LIBRARIES}
+  INCLUDE_DIRS
+    PRIVATE ${INCLUDE_DIRS}
+  INSTALL_FULL_PATH_DIR ${COLLECTD_PLUGIN_DIR}
+  COMPONENT ${COLLECTD_PLUGINS}
+  COMPILE_OPTIONS ${COMPILER_OPTIONS}
+)