From 81558c3f8cd5703f33ce421480c7b5fa045279aa Mon Sep 17 00:00:00 2001 From: Rahul Jadhav Date: Wed, 20 May 2020 03:18:30 +0800 Subject: [PATCH 1/2] fix for BORINGSSL_LIB and BORINGSSL_INCLUDE paths with cmake (#134) * fix for BORINGSSL_LIB and BORINGSSL_INCLUDE paths with cmake * fix boringssl lib search with different build dir --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c9a4f1..7e86085 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,7 @@ ELSE() FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME} NAMES lib${LIB_NAME}.a PATHS ${BORINGSSL_LIB} + PATH_SUFFIXES ${LIB_NAME} NO_DEFAULT_PATH) ENDIF() IF(BORINGSSL_LIB_${LIB_NAME}) From 4d221313f758a222912dcf6f574ef0b09cdcbfab Mon Sep 17 00:00:00 2001 From: Dmitri Tikhonov Date: Tue, 19 May 2020 16:15:46 -0400 Subject: [PATCH 2/2] Update version to 2.14.8 --- CHANGELOG | 6 ++++++ CMakeLists.txt | 1 - docs/conf.py | 2 +- include/lsquic.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dce5508..300be3f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +2020-05-19 + - 2.14.8 + - Support Android. + - Rerrange tree: move command-line examples into bin/ and unit + tests into tests/ from test/unittests/. + 2020-05-12 - 2.14.7 - [BUGFIX] ALPN-to-version mapping: do not skip h3-Q050. diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e86085..e8054ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,7 +162,6 @@ ELSE() MESSAGE(STATUS "${BORINGSSL_LIB} library not found") ENDIF() ENDFOREACH() -#endif ENDIF() diff --git a/docs/conf.py b/docs/conf.py index b31bf3b..f01f6a4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,7 +26,7 @@ author = u'LiteSpeed Technologies' # The short X.Y version version = u'2.14' # The full version, including alpha/beta/rc tags -release = u'2.14.7' +release = u'2.14.8' # -- General configuration --------------------------------------------------- diff --git a/include/lsquic.h b/include/lsquic.h index ee19946..78e336b 100644 --- a/include/lsquic.h +++ b/include/lsquic.h @@ -25,7 +25,7 @@ extern "C" { #define LSQUIC_MAJOR_VERSION 2 #define LSQUIC_MINOR_VERSION 14 -#define LSQUIC_PATCH_VERSION 7 +#define LSQUIC_PATCH_VERSION 8 /** * Engine flags: