From d16004d56c22635a0e21b177933dc39b65a3642a Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Sun, 26 Aug 2018 10:14:52 +0200
Subject: cmake: move functions to src/cmake

Change-Id: Ibcb7105fa7e3c09efdce01bccd4de235fe33ea99
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 src/plugins/CMakeLists.txt            | 42 +----------------------------------
 src/plugins/tlsopenssl/CMakeLists.txt |  1 +
 2 files changed, 2 insertions(+), 41 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 877d25dd907..e54eaa2c4cb 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -16,49 +16,9 @@ include_directories (
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-macro(add_vpp_plugin name)
-  cmake_parse_arguments(PLUGIN
-    ""
-    "LINK_FLAGS"
-    "SOURCES;API_FILES;MULTIARCH_SOURCES;LINK_LIBRARIES;API_TEST_SOURCES"
-    ${ARGN}
-  )
-  set(plugin_name ${name}_plugin)
-  set(api_headers)
-  foreach(f ${PLUGIN_API_FILES})
-     vpp_generate_api_header(${f} plugins)
-     list(APPEND api_headers ${f}.h ${f}.json)
-  endforeach()
-  add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_headers})
-  add_dependencies(${plugin_name} vpp_version_h api_headers)
-  set_target_properties(${plugin_name} PROPERTIES
-    PREFIX ""
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_plugins)
-  if(PLUGIN_MULTIARCH_SOURCES)
-    vpp_library_set_multiarch_sources(${plugin_name} ${PLUGIN_MULTIARCH_SOURCES})
-  endif()
-  if(PLUGIN_LINK_LIBRARIES)
-    target_link_libraries(${plugin_name} ${PLUGIN_LINK_LIBRARIES})
-  endif()
-  if(PLUGIN_LINK_FLAGS)
-    set_target_properties(${plugin_name} PROPERTIES LINK_FLAGS "${PLUGIN_LINK_FLAGS}")
-  endif()
-  if(PLUGIN_API_TEST_SOURCES)
-    set(test_plugin_name ${name}_test_plugin)
-    add_library(${test_plugin_name} SHARED ${PLUGIN_API_TEST_SOURCES} ${api_headers})
-    add_dependencies(${test_plugin_name} api_headers)
-    set_target_properties(${test_plugin_name} PROPERTIES
-      PREFIX ""
-      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_api_test_plugins)
-    install(TARGETS ${test_plugin_name} DESTINATION lib/vpp_api_test_plugins COMPONENT
-	    plugins)
-  endif()
-  install(TARGETS ${plugin_name} DESTINATION lib/vpp_plugins COMPONENT plugins)
-endmacro()
-
 ##############################################################################
 # find and add all plugin subdirs
-############################################################################
+##############################################################################
 FILE(GLOB files RELATIVE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt
diff --git a/src/plugins/tlsopenssl/CMakeLists.txt b/src/plugins/tlsopenssl/CMakeLists.txt
index fac27f5457c..609be907040 100644
--- a/src/plugins/tlsopenssl/CMakeLists.txt
+++ b/src/plugins/tlsopenssl/CMakeLists.txt
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 if(OPENSSL_FOUND)
+  include_directories(${OPENSSL_INCLUDE_DIR})
   add_vpp_plugin(tlsopenssl
     SOURCES
     tls_openssl.c
-- 
cgit 1.2.3-korg