From 4b3a9443b53110ca7e25684a5bc61acdd5484be6 Mon Sep 17 00:00:00 2001 From: Evgeny Kotkov Date: Tue, 29 Nov 2016 00:00:28 +0000 Subject: mod_brotli: Update makefiles to use the library layout of the official Brotli repository. With the recent update (https://github.com/google/brotli/pull/464), the official repository now produces pkg-config metadata files (brotli.pc), and has a fixed library layout (libbrotlicommon/libbrotlienc/libbrotlidec) on both Windows and Linux. Expect this layout in the makefiles, and take advantage of the pkg-config metadata, if it's available. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1771827 13f79535-47bb-0310-9956-ffa450edef68 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 446c1f4e71..890618f465 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,8 @@ ELSE() SET(default_nghttp2_libraries "${CMAKE_INSTALL_PREFIX}/lib/nghttp2.lib") ENDIF() -IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/brotli_enc.lib") - SET(default_brotli_libraries "${CMAKE_INSTALL_PREFIX}/lib/brotli_enc.lib" "${CMAKE_INSTALL_PREFIX}/lib/brotli_common.lib") +IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/brotlienc.lib") + SET(default_brotli_libraries "${CMAKE_INSTALL_PREFIX}/lib/brotlienc.lib" "${CMAKE_INSTALL_PREFIX}/lib/brotlicommon.lib") ELSE() SET(default_brotli_libraries) ENDIF() -- cgit v1.2.3