Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
694c0a4f
Commit
694c0a4f
authored
Nov 15, 2020
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: Remove spdylay
parent
da7959c2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
49 deletions
+0
-49
CMakeLists.txt
CMakeLists.txt
+0
-5
Makefile.am
Makefile.am
+0
-1
cmake/FindSpdylay.cmake
cmake/FindSpdylay.cmake
+0
-40
cmakeconfig.h.in
cmakeconfig.h.in
+0
-3
No files found.
CMakeLists.txt
View file @
694c0a4f
...
...
@@ -84,8 +84,6 @@ find_package(LibXml2 2.6.26)
set
(
WITH_LIBXML2_DEFAULT
${
LIBXML2_FOUND
}
)
find_package
(
Jemalloc
)
set
(
WITH_JEMALLOC_DEFAULT
${
JEMALLOC_FOUND
}
)
find_package
(
Spdylay 1.3.2
)
set
(
WITH_SPDYLAY_DEFAULT
${
SPDYLAY_FOUND
}
)
include
(
CMakeOptions.txt
)
...
...
@@ -220,8 +218,6 @@ else()
endif
()
# jemalloc
set
(
HAVE_JEMALLOC
${
JEMALLOC_FOUND
}
)
# spdylay (for src/nghttpx and src/h2load)
set
(
HAVE_SPDYLAY
${
SPDYLAY_FOUND
}
)
if
(
ENABLE_ASIO_LIB
)
find_package
(
Boost 1.54.0 REQUIRED system thread
)
...
...
@@ -504,7 +500,6 @@ message(STATUS "summary of build options:
Libev:
${
HAVE_LIBEV
}
(LIBS='
${
LIBEV_LIBRARIES
}
')
Libc-ares:
${
HAVE_LIBCARES
}
(LIBS='
${
LIBCARES_LIBRARIES
}
')
Libevent(SSL):
${
HAVE_LIBEVENT_OPENSSL
}
(LIBS='
${
LIBEVENT_OPENSSL_LIBRARIES
}
')
Spdylay:
${
HAVE_SPDYLAY
}
(LIBS='
${
SPDYLAY_LIBRARIES
}
')
Jansson:
${
HAVE_JANSSON
}
(LIBS='
${
JANSSON_LIBRARIES
}
')
Jemalloc:
${
HAVE_JEMALLOC
}
(LIBS='
${
JEMALLOC_LIBRARIES
}
')
Zlib:
${
HAVE_ZLIB
}
(LIBS='
${
ZLIB_LIBRARIES
}
')
...
...
Makefile.am
View file @
694c0a4f
...
...
@@ -37,7 +37,6 @@ EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
cmakeconfig.h.in
\
CMakeLists.txt
\
CMakeOptions.txt
\
cmake/FindSpdylay.cmake
\
cmake/ExtractValidFlags.cmake
\
cmake/FindJemalloc.cmake
\
cmake/FindLibev.cmake
\
...
...
cmake/FindSpdylay.cmake
deleted
100644 → 0
View file @
da7959c2
# - Try to find spdylay
# Once done this will define
# SPDYLAY_FOUND - System has spdylay
# SPDYLAY_INCLUDE_DIRS - The spdylay include directories
# SPDYLAY_LIBRARIES - The libraries needed to use spdylay
find_package
(
PkgConfig QUIET
)
pkg_check_modules
(
PC_SPDYLAY QUIET libspdylay
)
find_path
(
SPDYLAY_INCLUDE_DIR
NAMES spdylay/spdylay.h
HINTS
${
PC_SPDYLAY_INCLUDE_DIRS
}
)
find_library
(
SPDYLAY_LIBRARY
NAMES spdylay
HINTS
${
PC_SPDYLAY_LIBRARY_DIRS
}
)
if
(
SPDYLAY_INCLUDE_DIR
)
set
(
_version_regex
"^#define[
\t
]+SPDYLAY_VERSION[
\t
]+
\"
([^
\"
]+)
\"
.*"
)
file
(
STRINGS
"
${
SPDYLAY_INCLUDE_DIR
}
/spdylay/spdylayver.h"
SPDYLAY_VERSION REGEX
"
${
_version_regex
}
"
)
string
(
REGEX REPLACE
"
${
_version_regex
}
"
"
\\
1"
SPDYLAY_VERSION
"
${
SPDYLAY_VERSION
}
"
)
unset
(
_version_regex
)
endif
()
include
(
FindPackageHandleStandardArgs
)
# handle the QUIETLY and REQUIRED arguments and set SPDYLAY_FOUND to TRUE
# if all listed variables are TRUE and the requested version matches.
find_package_handle_standard_args
(
Spdylay REQUIRED_VARS
SPDYLAY_LIBRARY SPDYLAY_INCLUDE_DIR
VERSION_VAR SPDYLAY_VERSION
)
if
(
SPDYLAY_FOUND
)
set
(
SPDYLAY_LIBRARIES
${
SPDYLAY_LIBRARY
}
)
set
(
SPDYLAY_INCLUDE_DIRS
${
SPDYLAY_INCLUDE_DIR
}
)
endif
()
mark_as_advanced
(
SPDYLAY_INCLUDE_DIR SPDYLAY_LIBRARY
)
cmakeconfig.h.in
View file @
694c0a4f
...
...
@@ -13,9 +13,6 @@
/* Define to 1 if you have `libxml2` library. */
#cmakedefine HAVE_LIBXML2 1
/* Define to 1 if you have `spdylay` library. */
#cmakedefine HAVE_SPDYLAY 1
/* Define to 1 if you have `mruby` library. */
#cmakedefine HAVE_MRUBY 1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment