diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 161a7ee..58ae48c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,15 +22,15 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.14) # XXX using 1.8.90 instead of 1.9.0-DEV -project(nghttp2 VERSION 1.59.0) +project(nghttp2 VERSION 1.60.0) # See versioning rule: # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -set(LT_CURRENT 40) +set(LT_CURRENT 41) set(LT_REVISION 0) -set(LT_AGE 26) +set(LT_AGE 27) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) include(Version) @@ -60,6 +60,8 @@ if(NOT ENABLE_LIB_ONLY) find_package(Libev 4.11) find_package(Libcares 1.7.5) find_package(ZLIB 1.2.3) + find_package(Libbrotlienc 1.0.9) + find_package(Libbrotlidec 1.0.9) endif() find_package(OpenSSL 1.1.1) @@ -165,12 +167,8 @@ endif() # XXX shouldn't ${CMAKE_DL_LIBS} be appended to OPENSSL_LIBRARIES instead of # APP_LIBRARIES if it is really specific to OpenSSL? -find_package(CUnit 2.1) enable_testing() -set(HAVE_CUNIT ${CUNIT_FOUND}) -if(HAVE_CUNIT) - add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) -endif() +add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) # openssl (for src) include(CheckSymbolExists) @@ -222,6 +220,13 @@ endif() # jemalloc set(HAVE_JEMALLOC ${JEMALLOC_FOUND}) +# libbrotli (for src) +set(HAVE_LIBBROTLIENC ${LIBBROTLIENC_FOUND}) +set(HAVE_LIBBROTLIDEC ${LIBBROTLIDEC_FOUND}) +if(LIBBROTLIENC_FOUND AND LIBBROTLIDEC_FOUND) + set(HAVE_LIBBROTLI 1) +endif() + # libbpf (for bpf) set(HAVE_LIBBPF ${LIBBPF_FOUND}) if(LIBBPF_FOUND) @@ -458,7 +463,6 @@ message(STATUS "summary of build options: Python: ${Python3_EXECUTABLE} Python3_VERSION: ${Python3_VERSION} Test: - CUnit: ${HAVE_CUNIT} (LIBS='${CUNIT_LIBRARIES}') Failmalloc: ${ENABLE_FAILMALLOC} Libs: OpenSSL: ${HAVE_OPENSSL} (LIBS='${OPENSSL_LIBRARIES}') @@ -474,6 +478,8 @@ message(STATUS "summary of build options: Jemalloc: ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}') Zlib: ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}') Systemd: ${HAVE_SYSTEMD} (LIBS='${SYSTEMD_LIBRARIES}') + Libbrotlienc: ${HAVE_LIBBROTLIENC} (LIBS='${LIBBROTLIENC_LIBRARIES}') + Libbrotlidec: ${HAVE_LIBBROTLIDEC} (LIBS='${LIBBROTLIDEC_LIBRARIES}') Third-party: http-parser: ${ENABLE_THIRD_PARTY} MRuby: ${HAVE_MRUBY} |