X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2FCMakeLists.txt;h=456cba9baeb79eb6d8e61e0a64b363f529e92003;hb=248210c6c;hp=55c476705231aad6012cb5e8cf7aabaaae7ee3ab;hpb=2bfdda76d8b1cffcd8e30ca6855f293b1b1953c5;p=vpp.git

diff --git a/src/vlibmemory/CMakeLists.txt b/src/vlibmemory/CMakeLists.txt
index 55c47670523..456cba9baeb 100644
--- a/src/vlibmemory/CMakeLists.txt
+++ b/src/vlibmemory/CMakeLists.txt
@@ -11,25 +11,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-vpp_add_api_files(vlibmemory_api_headers
-  memclnt.api
-)
-
-add_library (vlibmemory SHARED
+add_vpp_library (vlibmemory
+  SOURCES
   memory_api.c
   memory_shared.c
   memory_client.c
+  socket_client.c
   socket_api.c
-  vlib_api.c
+  memclnt_api.c
   vlib_api_cli.c
+  vlib_api.c
   ../vlibapi/api_shared.c
   ../vlibapi/node_serialize.c
-)
-target_link_libraries (vlibmemory vppinfra svm vlib)
-add_dependencies(vlibmemory vlibmemory_api_headers)
-install (TARGETS vlibmemory DESTINATION lib)
 
-vpp_add_header_files(vlibmemory
+  INSTALL_HEADERS
   vl_memory_msg_enum.h
   memory_shared.h
   vl_memory_api_h.h
@@ -38,16 +33,27 @@ vpp_add_header_files(vlibmemory
   api.h
   memory_client.h
   socket_api.h
+
+  API_FILES
+  memclnt.api
+  vlib.api
+
+  LINK_LIBRARIES vppinfra svm vlib
 )
+add_dependencies(vlibmemory vlibmemory_api_headers)
 
-add_library (vlibmemoryclient SHARED
+add_vpp_library (vlibmemoryclient
+  SOURCES
   memory_shared.c
   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
+)
 add_dependencies(vlibmemoryclient vlibmemory_api_headers)
-install (TARGETS vlibmemoryclient DESTINATION lib)
+
+add_vat_test_library(vlib
+  vlibapi_test.c
+)