X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2FCMakeLists.txt;h=e6d8f98ffed9492e0372c664e4b69b2ed0836873;hb=935ce75cb;hp=e592ce54f3222f5e6f6c3892fa18ad9b16a76ee3;hpb=2bfdda76d8b1cffcd8e30ca6855f293b1b1953c5;p=vpp.git

diff --git a/src/vcl/CMakeLists.txt b/src/vcl/CMakeLists.txt
index e592ce54f32..e6d8f98ffed 100644
--- a/src/vcl/CMakeLists.txt
+++ b/src/vcl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2018-2019 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:
@@ -14,46 +14,35 @@
 ##############################################################################
 # vppcom shared library
 ##############################################################################
-add_library(vppcom SHARED
+add_vpp_library(vppcom
+  SOURCES
   vppcom.c
   vcl_bapi.c
   vcl_cfg.c
-  vcl_event.c
   vcl_private.c
+  vcl_locked.c
+  vcl_sapi.c
+
+  LINK_LIBRARIES
+  vppinfra svm vlibmemoryclient rt pthread
+
+  DEPENDS
+  api_headers
 )
-target_link_libraries(vppcom vppinfra svm vlibmemoryclient rt pthread)
-install(TARGETS vppcom DESTINATION lib)
 
-##############################################################################
-# vcl headers
-##############################################################################
-vpp_add_header_files(vcl
+add_vpp_library(vcl_ldpreload
+  SOURCES
+  ldp_socket_wrapper.c
+  ldp.c
+
+  LINK_LIBRARIES
+  vppinfra svm vlibmemoryclient rt pthread vppcom dl
+)
+
+add_vpp_headers(vcl
   ldp.h
-  vcl_event.h
-  sock_test.h
   ldp_glibc_socket.h
-  vcl_test.h
   vppcom.h
+  vcl_locked.h
   ldp_socket_wrapper.h
-  sock_test_common.h
-)
-
-##############################################################################
-# vcl tests
-##############################################################################
-option(VPP_BUILD_VCL_TESTS "Build vcl tests." ON)
-if(VPP_BUILD_VCL_TESTS)
-  set(VCL_TESTS
-    vcl_test_server
-    vcl_test_client
-    sock_test_server
-    sock_test_client
-    test_vcl_listener_server
-    test_vcl_listener_client
-  )
-  foreach(test ${VCL_TESTS})
-    add_executable(${test} ${test}.c)
-    target_link_libraries(${test} vppcom)
-  endforeach()
-endif(VPP_BUILD_VCL_TESTS)
-
+)
\ No newline at end of file