X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=cdf756e1b8226b2cb81bc7cd9c46e1740041a0bd;hb=74449b8b68801e0938f528f19d69e75644cb2ee9;hp=790d6a204777a36f5977dae32ed7cc08da6acb5a;hpb=2ddfe7524001270654c2027378b05f10e527eb5c;p=vpp.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 790d6a20477..cdf756e1b82 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,12 +118,23 @@ find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
 include_directories(${OPENSSL_INCLUDE_DIR})
 
-add_definitions(-DHAVE_MEMFD_CREATE -DVPP_API_TEST_BUILTIN=1)
+##############################################################################
+# Check for memfd_create headers and libs
+##############################################################################
+check_c_source_compiles("
+  #define _GNU_SOURCE
+  #include <sys/mman.h>
+  int main() { return memfd_create (\"/dev/false\", 0); }
+" HAVE_MEMFD_CREATE)
+
+if (HAVE_MEMFD_CREATE)
+    add_definitions(-DHAVE_MEMFD_CREATE)
+endif()
 
 ##############################################################################
 # API
 ##############################################################################
-function(vpp_generate_api_header file)
+function(vpp_generate_api_c_header file)
   set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.h)
   get_filename_component(output_dir ${output_name} DIRECTORY)
   add_custom_command (OUTPUT ${output_name}
@@ -131,15 +142,39 @@ function(vpp_generate_api_header file)
     COMMAND ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen
     ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --output ${output_name}
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
-    COMMENT "Generating API header ${file}.h"
+    COMMENT "Generating API header ${output_name}"
+  )
+endfunction()
+
+function(vpp_generate_api_json_header file dir)
+  set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.json)
+  get_filename_component(output_dir ${output_name} DIRECTORY)
+  add_custom_command (OUTPUT ${output_name}
+    COMMAND mkdir -p ${output_dir}
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen
+    ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+    COMMENT "Generating API header ${output_name}"
   )
+  install(FILES ${output_name} DESTINATION share/vpp/api/${dir}/)
+endfunction()
+
+##############################################################################
+# generate the .h and .json files for a .api file
+#  @param file - the name of the .api
+#  @param dir  - the install directory under ROOT/share/vpp/api to place the
+#                generated .json file
+##############################################################################
+function(vpp_generate_api_header file dir)
+    vpp_generate_api_c_header (${file})
+    vpp_generate_api_json_header (${file} ${dir})
 endfunction()
 
 function(vpp_add_api_files target)
   unset(header_files)
   foreach(file ${ARGN})
-    vpp_generate_api_header (${file})
-    list (APPEND header_files ${file}.h)
+    vpp_generate_api_header (${file} core)
+    list (APPEND header_files ${file}.h ${file}.json)
   endforeach()
   add_custom_target(${target} DEPENDS ${header_files})
 endfunction()
@@ -161,7 +196,7 @@ endfunction()
 ##############################################################################
 # subdirs
 ##############################################################################
-foreach (DIR vppinfra svm vlib vlibmemory vnet vpp vpp-api vcl plugins)
+foreach (DIR vppinfra svm vlib vlibmemory vlibapi vnet vpp vpp-api vat vcl plugins)
   add_subdirectory(${DIR})
 endforeach ()