Author: brane
Date: Sun Jun 1 13:39:43 2025
New Revision: 1926042
URL: http://svn.apache.org/viewvc?rev=1926042&view=rev
Log:
Rename some CMake variables to match the case of FindBrotly.cmake.
Big applause, laddies and gents, to case-insensitive file systems!
* CMakeLists.txt
(Brotli_ROOT): Renamed from BROTLI_ROOT.
(Brotli_FOUND): Renamed from BROTLI_FOUND.
(Brotli::Decode): Renamed from BROTLI::DECODE.
* build/FindBrotli.cmake
(Brotli): Renamed from BROTLI.
(Brotli_ROOT): Renamed from BROTLI_ROOT.
(Brotli_FOUND): Renamed from BROTLI_FOUND.
(Brotli::Common): Renamed from BROTLI::COMMON.
(Brotli::Decode): Renamed from BROTLI::DECODE.
(Brotli::Encode): Renamed from BROTLI::ENCODE.
* build/SerfMacOS.cmake:
(Brotli_ROOT): Renamed from BROTLI_ROOT.
Modified:
serf/trunk/CMakeLists.txt
serf/trunk/build/FindBrotli.cmake
serf/trunk/build/SerfMacOS.cmake
Modified: serf/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1926042&r1=1926041&r2=1926042&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Sun Jun 1 13:39:43 2025
@@ -26,7 +26,7 @@
# APRUtil_ROOT - Path to APR-Util's install area
# OPENSSL_ROOT_DIR - Path to OpenSSL's install area
# ZLIB_ROOT - Path to zlib's install area
-# BROTLI_ROOT - Path to Brotli's install area
+# Brotli_ROOT - Path to Brotli's install area
# GSSAPI_ROOT - Path to GSSAPI's install area
# ===================================================================
@@ -54,7 +54,7 @@ option(APR_ROOT:PATH "Path to APR's inst
option(APRUtil_ROOT:PATH "Path to APR-Util's install area" "")
option(OPENSSL_ROOT_DIR:PATH "Path to OpenSSL's install area" "")
option(ZLIB_ROOT:PATH "Path to zlib's install area" "")
-option(BROTLI_ROOT:PATH "Path to Brotli's install area" "")
+option(Brotli_ROOT:PATH "Path to Brotli's install area" "")
option(GSSAPI_ROOT:PATH "Path to GSSAPI's install area" "")
# Build options
@@ -234,7 +234,7 @@ find_package(APR REQUIRED)
find_package(APRUtil REQUIRED)
# Find optional dependencies
-find_package(BROTLI)
+find_package(Brotli)
if(NOT SERF_WINDOWS)
find_package(GSSAPI)
else()
@@ -247,8 +247,8 @@ endif()
# Calculate the set of private and public targets
set(SERF_PRIVATE_TARGETS OpenSSL::Crypto OpenSSL::SSL ZLIB::ZLIB)
-if(BROTLI_FOUND)
- list(APPEND SERF_PRIVATE_TARGETS BROTLI::DECODE)
+if(Brotli_FOUND)
+ list(APPEND SERF_PRIVATE_TARGETS Brotli::Decode)
endif()
if(GSSAPI_FOUND)
add_compile_definitions("SERF_HAVE_GSSAPI")
@@ -288,12 +288,12 @@ CheckFunctionMacro("SSL_library_init" "S
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_LIBRARIES}
${SERF_STANDARD_LIBRARIES})
CheckHeader("stdbool.h" "HAVE_STDBOOL_H=1")
CheckType("OSSL_HANDSHAKE_STATE" "openssl/ssl.h"
"SERF_HAVE_OSSL_HANDSHAKE_STATE" ${OPENSSL_INCLUDE_DIR})
-if(BROTLI_FOUND)
+if(Brotli_FOUND)
CheckType("BrotliDecoderResult" "brotli/decode.h"
"SERF_HAVE_BROTLI_DECODER_RESULT" ${BROTLI_INCLUDES})
# Check for the function only if the type check succeeded.
get_directory_property(_cdef COMPILE_DEFINITIONS)
if("SERF_HAVE_BROTLI_DECODER_RESULT" IN_LIST _cdef)
- CheckFunction("BrotliDecoderTakeOutput" "SERF_HAVE_BROTLI" BROTLI::DECODE
${SERF_STANDARD_LIBRARIES})
+ CheckFunction("BrotliDecoderTakeOutput" "SERF_HAVE_BROTLI" Brotli::Decode
${SERF_STANDARD_LIBRARIES})
endif()
endif()
Modified: serf/trunk/build/FindBrotli.cmake
URL:
http://svn.apache.org/viewvc/serf/trunk/build/FindBrotli.cmake?rev=1926042&r1=1926041&r2=1926042&view=diff
==============================================================================
--- serf/trunk/build/FindBrotli.cmake (original)
+++ serf/trunk/build/FindBrotli.cmake Sun Jun 1 13:39:43 2025
@@ -20,15 +20,15 @@
cmake_minimum_required(VERSION 3.12)
include(GNUInstallDirs)
-set(BROTLI_FOUND FALSE)
+set(Brotli_FOUND FALSE)
function(_get_brotli_version)
- if(DEFINED BROTLI_ROOT)
- get_filename_component(BROTLI_ROOT "${BROTLI_ROOT}" REALPATH)
+ if(DEFINED Brotli_ROOT)
+ get_filename_component(Brotli_ROOT "${Brotli_ROOT}" REALPATH)
find_program(brotli NAMES "brotli"
PATHS
- "${BROTLI_ROOT}/bin"
- "${BROTLI_ROOT}/${CMAKE_INSTALL_BINDIR}"
+ "${Brotli_ROOT}/bin"
+ "${Brotli_ROOT}/${CMAKE_INSTALL_BINDIR}"
NO_DEFAULT_PATH)
else()
find_program(brotli NAMES "brotli")
@@ -49,24 +49,24 @@ function(_get_brotli_version)
endfunction(_get_brotli_version)
function(_get_brotli_includes_libs)
- if(DEFINED BROTLI_ROOT)
+ if(DEFINED Brotli_ROOT)
find_path(includes "decode.h"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES
"include/brotli"
"${CMAKE_INSTALL_INCLUDEDIR}/brotli}"
NO_DEFAULT_PATH)
get_filename_component(includes "${includes}" DIRECTORY)
find_library(common_lib "brotlicommon"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES "lib" "${CMAKE_INSTALL_LIBDIR}"
NO_DEFAULT_PATH)
find_library(decode_lib "brotlidec"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES "lib" "${CMAKE_INSTALL_LIBDIR}"
NO_DEFAULT_PATH)
find_library(encode_lib "brotlienc"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES "lib" "${CMAKE_INSTALL_LIBDIR}"
NO_DEFAULT_PATH)
else()
@@ -93,28 +93,28 @@ if(NOT EXISTS "${BROTLI_INCLUDES}/brotli
message(STATUS "Could NOT find Brotli (missing headers)")
else()
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(BROTLI
+ find_package_handle_standard_args(Brotli
REQUIRED_VARS BROTLI_COMMON_LIBRARY
BROTLI_DECODE_LIBRARY
BROTLI_ENCODE_LIBRARY
BROTLI_INCLUDES
VERSION_VAR BROTLI_VERSION)
- if(BROTLI_FOUND)
- add_library(BROTLI::COMMON UNKNOWN IMPORTED)
- set_target_properties(BROTLI::COMMON PROPERTIES
+ if(Brotli_FOUND)
+ add_library(Brotli::Common UNKNOWN IMPORTED)
+ set_target_properties(Brotli::Common PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDES}"
IMPORTED_LOCATION "${BROTLI_COMMON_LIBRARY}")
- add_library(BROTLI::DECODE UNKNOWN IMPORTED)
- set_target_properties(BROTLI::DECODE PROPERTIES
+ add_library(Brotli::Decode UNKNOWN IMPORTED)
+ set_target_properties(Brotli::Decode PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDES}"
- INTERFACE_LINK_LIBRARIES BROTLI::COMMON
+ INTERFACE_LINK_LIBRARIES Brotli::Common
IMPORTED_LOCATION "${BROTLI_DECODE_LIBRARY}")
- add_library(BROTLI::ENCODE UNKNOWN IMPORTED)
- set_target_properties(BROTLI::ENCODE PROPERTIES
+ add_library(Brotli::Encode UNKNOWN IMPORTED)
+ set_target_properties(Brotli::Encode PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDES}"
- INTERFACE_LINK_LIBRARIES BROTLI::COMMON
+ INTERFACE_LINK_LIBRARIES Brotli::Common
IMPORTED_LOCATION "${BROTLI_ENCODE_LIBRARY}")
endif()
endif()
Modified: serf/trunk/build/SerfMacOS.cmake
URL:
http://svn.apache.org/viewvc/serf/trunk/build/SerfMacOS.cmake?rev=1926042&r1=1926041&r2=1926042&view=diff
==============================================================================
--- serf/trunk/build/SerfMacOS.cmake (original)
+++ serf/trunk/build/SerfMacOS.cmake Sun Jun 1 13:39:43 2025
@@ -50,7 +50,7 @@ function(serf_macos_find_packages)
# The user can always override that on the command line.
_serf_macos__find_package("zlib" ZLIB_ROOT "Path to zlib's install area")
endif()
- _serf_macos__find_package("brotli" BROTLI_ROOT "Path to Brotli's install
area")
+ _serf_macos__find_package("brotli" Brotli_ROOT "Path to Brotli's install
area")
_serf_macos__find_package("gssapi" GSSAPI_ROOT "Path to GSSAPI's install
area")
endfunction()
