cmake builds with quiche/quic support#9833
Closed
bryancall wants to merge 2 commits intoapache:masterfrom
Closed
Conversation
bryancall
force-pushed
the
cmake_quiche
branch
2 times, most recently
from
30bd92f to
9f405b5
Compare
Contributor
Author
|
[approve ci] |
maskit
reviewed
Jun 14, 2023
| set(QUIC_LIBRARIES ${QUICHE_LIBRARY} http3 quic) | ||
| set(QUIC_INCLUDE_DIRS ${QUICHE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/iocore/net/quic) | ||
| set(TS_HAS_QUICHE 1) | ||
| set(TS_USE_QUIC 1) |
Member
There was a problem hiding this comment.
TS_USE_QUIC becomes 1 if the both Quiche and BoringSSL are available.
enable_quic=no
TS_CHECK_QUICHE
if test "${has_quiche}" = "1"; then
if test "$openssl_is_boringssl" = "1" ; then
enable_quic=yes
else
AC_MSG_ERROR([Use of BoringSSL is required if Quiche is used.])
fi
fi
JosiahWI
reviewed
Jun 14, 2023
Comment on lines
+78
to
+79
| CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H) | ||
| CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H) |
Contributor
There was a problem hiding this comment.
Suggested change
| CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H) | |
| CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H) | |
| check_include_file(stdint.h HAVE_STDINT_H) | |
| check_include_file(stdlib.h HAVE_STDLIB_H) |
Comment on lines
+20
to
+21
| find_path(QUICHE_INCLUDE_DIR NAMES quiche.h HINTS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES include) | ||
| find_library(QUICHE_LIBRARY NAMES quiche HINTS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES lib) |
Contributor
There was a problem hiding this comment.
Suggested change
| find_path(QUICHE_INCLUDE_DIR NAMES quiche.h HINTS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES include) | |
| find_library(QUICHE_LIBRARY NAMES quiche HINTS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES lib) | |
| find_path(QUICHE_INCLUDE_DIR NAMES quiche.h PATHS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES include) | |
| find_library(QUICHE_LIBRARY NAMES quiche PATHS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES lib) |
Search the paths specified by the HINTS option. These should be paths computed by system introspection, such as a hint provided by the location of another item already found. Hard-coded guesses should be specified with the PATHS option.
(https://cmake.org/cmake/help/latest/command/find_library.html)
Contributor
There was a problem hiding this comment.
You don't need PATH_SUFFIXES here at all. lib/ and include/ are already default search paths.
| find_path(QUICHE_INCLUDE_DIR NAMES quiche.h HINTS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES include) | ||
| find_library(QUICHE_LIBRARY NAMES quiche HINTS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES lib) | ||
|
|
||
| INCLUDE(FindPackageHandleStandardArgs) |
Contributor
There was a problem hiding this comment.
Suggested change
| INCLUDE(FindPackageHandleStandardArgs) | |
| include(FindPackageHandleStandardArgs) |
Comment on lines
+36
to
+38
| ${CMAKE_SOURCE_DIR}/iocore/net | ||
| ${CMAKE_SOURCE_DIR}/iocore/net/quic | ||
| ${CMAKE_SOURCE_DIR}/iocore/eventsystem |
Contributor
There was a problem hiding this comment.
Suggested change
| ${CMAKE_SOURCE_DIR}/iocore/net | |
| ${CMAKE_SOURCE_DIR}/iocore/net/quic | |
| ${CMAKE_SOURCE_DIR}/iocore/eventsystem | |
| "${CMAKE_SOURCE_DIR}/iocore/net" | |
| "${CMAKE_SOURCE_DIR}/iocore/net/quic" | |
| "${CMAKE_SOURCE_DIR}/iocore/eventsystem" |
Comment on lines
+40
to
+43
| ${CMAKE_SOURCE_DIR}/iocore/net | ||
| ${CMAKE_SOURCE_DIR}/iocore/net/quic | ||
| ${CMAKE_SOURCE_DIR}/iocore/eventsystem | ||
| ${CMAKE_SOURCE_DIR}/mgmt |
Contributor
There was a problem hiding this comment.
Suggested change
| ${CMAKE_SOURCE_DIR}/iocore/net | |
| ${CMAKE_SOURCE_DIR}/iocore/net/quic | |
| ${CMAKE_SOURCE_DIR}/iocore/eventsystem | |
| ${CMAKE_SOURCE_DIR}/mgmt | |
| "${CMAKE_SOURCE_DIR}/iocore/net" | |
| "${CMAKE_SOURCE_DIR}/iocore/net/quic" | |
| "${CMAKE_SOURCE_DIR}/iocore/eventsystem" | |
| "${CMAKE_SOURCE_DIR}/mgmt" |
Comment on lines
+27
to
+30
| set(QUICHE_LIBRARY_DIR ${QUICHE_INSTALL_DIR}/lib) | ||
| set(QUIC_LIBRARY_DIRS ${QUICHE_LIBRARY_DIR}) | ||
| set(QUIC_LIBRARIES ${QUICHE_LIBRARY} http3 quic) | ||
| set(QUIC_INCLUDE_DIRS ${QUICHE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/iocore/net/quic) |
Contributor
There was a problem hiding this comment.
Suggested change
| set(QUICHE_LIBRARY_DIR ${QUICHE_INSTALL_DIR}/lib) | |
| set(QUIC_LIBRARY_DIRS ${QUICHE_LIBRARY_DIR}) | |
| set(QUIC_LIBRARIES ${QUICHE_LIBRARY} http3 quic) | |
| set(QUIC_INCLUDE_DIRS ${QUICHE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/iocore/net/quic) | |
| set(QUICHE_LIBRARY_DIR "${QUICHE_INSTALL_DIR}/lib") | |
| set(QUIC_LIBRARY_DIRS "${QUICHE_LIBRARY_DIR}") | |
| set(QUIC_LIBRARIES "${QUICHE_LIBRARY}" http3 quic) | |
| set(QUIC_INCLUDE_DIRS "${QUICHE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/iocore/net/quic") |
Contributor
|
Indentation seems very inconsistent. I think we're using 4-space indents in all the CMake stuff - CMake itself uses 2-space indents, which I like, but it might be good to have a unified style. |
JosiahWI
reviewed
Jun 14, 2023
| find_library(QUICHE_LIBRARY NAMES quiche HINTS ${QUICHE_INSTALL_DIR} PATH_SUFFIXES lib) | ||
|
|
||
| INCLUDE(FindPackageHandleStandardArgs) | ||
| FIND_PACKAGE_HANDLE_STANDARD_ARGS(QUICHE DEFAULT_MSG QUICHE_LIBRARY QUICHE_INCLUDE_DIR) |
Contributor
There was a problem hiding this comment.
Suggested change
| FIND_PACKAGE_HANDLE_STANDARD_ARGS(QUICHE DEFAULT_MSG QUICHE_LIBRARY QUICHE_INCLUDE_DIR) | |
| find_package_handle_standard_args(QUICHE DEFAULT_MSG QUICHE_LIBRARY QUICHE_INCLUDE_DIR) |
Contributor
Author
|
#9892 superseded this PR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.