X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2FCMakeLists.txt;h=2ee4dd08ba9b316cf4b257091d6ade09893c2ade;hb=a3808ee5b276d0ad17f01eefc891d24cb49d703d;hp=3459f03db1b61d211a10e834257cb8d0086b72b6;hpb=612dd6a955e44d2c0fed1801fb8de585ca695c63;p=vpp.git

diff --git a/src/vlibmemory/CMakeLists.txt b/src/vlibmemory/CMakeLists.txt
index 3459f03db1b..2ee4dd08ba9 100644
--- a/src/vlibmemory/CMakeLists.txt
+++ b/src/vlibmemory/CMakeLists.txt
@@ -11,31 +11,49 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-vpp_generate_api_header(memclnt.api)
-add_custom_target(vlibmemory_api_headers DEPENDS memclnt.api.h)
-
-add_library (vlibmemory SHARED
+add_vpp_library (vlibmemory
+  SOURCES
   memory_api.c
-  memory_shared.c
-  memory_client.c
   socket_api.c
-  vlib_api.c
+  memclnt_api.c
   vlib_api_cli.c
-  ../vlibapi/api_shared.c
-  ../vlibapi/node_serialize.c
+  vlib_api.c
+
+  INSTALL_HEADERS
+  vl_memory_msg_enum.h
+  vl_memory_api_h.h
+  socket_client.h
+  memory_api.h
+  api.h
+  memory_client.h
+  socket_api.h
+
+  API_FILES
+  memclnt.api
+  vlib.api
+
+  LINK_LIBRARIES vppinfra svm vlib vlibapi
 )
-target_link_libraries (vlibmemory vppinfra svm vlib)
 add_dependencies(vlibmemory vlibmemory_api_headers)
-install (TARGETS vlibmemory DESTINATION lib)
 
-add_library (vlibmemoryclient SHARED
-  memory_shared.c
+add_vpp_library (vlibmemoryclient
+  SOURCES
   memory_client.c
   socket_client.c
-  ../vlibapi/api_shared.c
-  ../vlibapi/node_serialize.c
-)
 
-target_link_libraries (vlibmemoryclient vppinfra svm vlib)
+  LINK_LIBRARIES vppinfra svm vlibapi
+)
 add_dependencies(vlibmemoryclient vlibmemory_api_headers)
-install (TARGETS vlibmemoryclient DESTINATION lib)
+
+add_vat_test_library(vlib
+  vlibapi_test.c
+)
+##############################################################################
+# VAT2 plugins
+##############################################################################
+add_vpp_test_library(vlibmemoryclient
+  memclnt.api
+)
+add_vpp_test_library(vlibmemory
+    vlib.api
+)