X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fquic%2FCMakeLists.txt;h=65bdc32a239df51c30ac672138457842a717544e;hb=dea806da536b8f1b49af9a852441d5f772f14486;hp=ccd49682e8c8cb6baf3e5f1527bb8d9694c94908;hpb=60f3e6547aa75a31fad1f78bea11c950cc30d63c;p=vpp.git

diff --git a/src/plugins/quic/CMakeLists.txt b/src/plugins/quic/CMakeLists.txt
index ccd49682e8c..65bdc32a239 100644
--- a/src/plugins/quic/CMakeLists.txt
+++ b/src/plugins/quic/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2019 Cisco
+# Copyright (c) 2021 Cisco
 # 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:
@@ -12,13 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-message(STATUS "Looking for quicly")
+if(NOT OPENSSL_FOUND)
+  message(WARNING "OpenSSL not found - quic plugin disabled")
+  return()
+endif()
+
 unset(QUIC_LINK_LIBRARIES)
+set(EXPECTED_QUICLY_VERSION "0.1.4-vpp")
 
-find_path(QUICLY_INCLUDE_DIR NAMES quicly.h)
-find_library (QUICLY_LIBRARY NAMES "libquicly.a")
-find_library (PICOTLS_CORE_LIBRARY NAMES "libpicotls-core.a")
-find_library (PICOTLS_OPENSSL_LIBRARY NAMES "libpicotls-openssl.a")
+vpp_find_path(QUICLY_INCLUDE_DIR NAMES quicly.h)
+vpp_find_path(PICOTLS_INCLUDE_DIR NAMES picotls.h)
+vpp_find_library(QUICLY_LIBRARY NAMES "libquicly.a")
+vpp_find_library(PICOTLS_CORE_LIBRARY NAMES "libpicotls-core.a")
+vpp_find_library(PICOTLS_OPENSSL_LIBRARY NAMES "libpicotls-openssl.a")
 
 list(APPEND QUIC_LINK_LIBRARIES
   ${QUICLY_LIBRARY}
@@ -27,17 +33,32 @@ list(APPEND QUIC_LINK_LIBRARIES
 )
 
 if(QUICLY_INCLUDE_DIR AND QUIC_LINK_LIBRARIES)
-  include_directories (${QUICLY_INCLUDE_DIR})
-  add_vpp_plugin(quic
-    SOURCES
-    quic.c
+  if(EXISTS "${QUICLY_INCLUDE_DIR}/quicly/version.h")
+    file(STRINGS "${QUICLY_INCLUDE_DIR}/quicly/version.h" quicly_version_str REGEX "^#define[\t ]+LIBQUICLY_VERSION[\t ]+\".*\"")
+    string(REGEX REPLACE "^#define[\t ]+LIBQUICLY_VERSION[\t ]+\"([^\"]*)\".*" "\\1" QUICLY_VERSION_STRING "${quicly_version_str}")
+    unset(quicly_version_str)
+  endif()
+
+  if (${QUICLY_VERSION_STRING} MATCHES "${EXPECTED_QUICLY_VERSION}")
+    include_directories (${QUICLY_INCLUDE_DIR})
+
+    if(PICOTLS_INCLUDE_DIR)
+      include_directories (${PICOTLS_INCLUDE_DIR})
+    endif()
 
-    INSTALL_HEADERS
-    quic.h
+    add_vpp_plugin(quic
+      SOURCES
+      certs.c
+      error.c
+      quic.c
+      quic_crypto.c
 
-    LINK_LIBRARIES ${QUIC_LINK_LIBRARIES}
-  )
-  message(STATUS "Found quicly in ${QUICLY_INCLUDE_DIR}")
+      LINK_LIBRARIES ${QUIC_LINK_LIBRARIES} ${OPENSSL_LIBRARIES}
+    )
+    message(STATUS "Found quicly ${EXPECTED_QUICLY_VERSION} in ${QUICLY_INCLUDE_DIR}")
+  else()
+    message(STATUS "-- quicly ${EXPECTED_QUICLY_VERSION} not found - QUIC plugin disabled")
+  endif()
 else()
-  message(WARNING "-- quicly not found - quic_plugin disabled")
+  message(WARNING "-- quicly headers not found - QUIC plugin disabled")
 endif()