Author: brane
Date: Thu Jul 17 22:43:22 2025
New Revision: 1927297
URL: http://svn.apache.org/viewvc?rev=1927297&view=rev
Log:
Improvements to the CMake build: include the Brotli libraries in the
generated pkg-config file, and remove unnecessary parameters from the APR
and APR-Util configuration.
* CMakeLists.txt
(make_pkgconfig): Add BROTLI_COMMON_LIBRARY and BROTLI_DECODE_LIBRARY
to the private libraries section of the pkg-config file.
* build/FindAPR.cmake
(APR_INCLUDE_DIR): Renamed from APR_INCLUDES. Use the --includedir option
of apr-{1,2}-config to retreive just the APR include directory, not any
other directories that APR may use during its build.
(APR_LDFLAGS): Removed.
(APR::APR_static): Declare interface libraries in target_link_libraries().
(APR::APR): Likewise.
* build/FindAPRUtil.cmake
(APRUTIL_INCLUDE_DIR): Renamed from APRUTIL_INCLUDES. As for APR, use
the --includedir opfion of apu-1-config. In this case it can be quite
important because --includes would contain the path to the OpenSSL used
to implement apr_crypto and could conflict with the version used by Serf.
(APRUTIL_LDFLAGS): Removed.
* build/SerfGenClangd.cmake: Use APR_INCLUDE_DIR and APRUTIL_INCLUDE_DIR.
Modified:
serf/trunk/CMakeLists.txt
serf/trunk/build/FindAPR.cmake
serf/trunk/build/FindAPRUtil.cmake
serf/trunk/build/SerfGenClangd.cmake
Modified: serf/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1927297&r1=1927296&r2=1927297&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Thu Jul 17 22:43:22 2025
@@ -495,6 +495,8 @@ if(NOT SERF_WINDOWS)
${APRUTIL_LDFLAGS}
${APRUTIL_LIBRARIES}
${APRUTIL_EXTRALIBS}
+ ${BROTLI_COMMON_LIBRARY}
+ ${BROTLI_DECODE_LIBRARY}
${GSSAPI_LIBRARIES}
${ZLIB_LIBRARIES}
)
Modified: serf/trunk/build/FindAPR.cmake
URL:
http://svn.apache.org/viewvc/serf/trunk/build/FindAPR.cmake?rev=1927297&r1=1927296&r2=1927297&view=diff
==============================================================================
--- serf/trunk/build/FindAPR.cmake (original)
+++ serf/trunk/build/FindAPR.cmake Thu Jul 17 22:43:22 2025
@@ -42,7 +42,7 @@ cmake_minimum_required(VERSION 3.12)
# APR_FOUND - True if APR was found.
# APR_VERSION - The version of APR found (x.y.z)
# APR_CONTAINS_APRUTIL - True if the APR major version is 2 or greater.
-# APR_INCLUDES - Where to find apr.h, etc.
+# APR_INCLUDE_DIR - Where to find apr.h, etc.
# APR_LIBRARIES - Linker switches to use with ld to link against APR
#
# ::
@@ -211,7 +211,7 @@ if(NOT _apru_include_only_utilities)
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- _apru_find_win_version("apr" APR_INCLUDES
+ _apru_find_win_version("apr" APR_INCLUDE_DIR
APR_VERSION _apr_major _apr_minor)
set(_apr_name "apr-${_apr_major}")
@@ -229,12 +229,11 @@ if(NOT _apru_include_only_utilities)
_apru_config(${APR_CONFIG_EXECUTABLE} ${_varname} "${_regexp}" "${ARGN}")
endmacro(_apr_invoke)
- _apr_invoke(APR_CFLAGS "(^| )-[gOW][^ ]*" --cppflags --cflags)
- _apr_invoke(APR_INCLUDES "(^| )-I" --includes)
- _apr_invoke(APR_LDFLAGS "" --ldflags)
- _apr_invoke(APR_LIBRARIES "" --link-ld)
- _apr_invoke(APR_EXTRALIBS "" --libs)
- _apr_invoke(APR_VERSION "" --version)
+ _apr_invoke(APR_CFLAGS "(^| )-[gOW][^ ]*" --cppflags --cflags)
+ _apr_invoke(APR_INCLUDE_DIR "" --includedir)
+ _apr_invoke(APR_LIBRARIES "" --link-ld)
+ _apr_invoke(APR_EXTRALIBS "" --libs)
+ _apr_invoke(APR_VERSION "" --version)
string(REGEX REPLACE "^([0-9]+)\\..*$" "\\1" _apr_major "${APR_VERSION}")
endif() # NOT Windows
@@ -248,7 +247,7 @@ if(NOT _apru_include_only_utilities)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
APR
- REQUIRED_VARS APR_LIBRARIES APR_INCLUDES
+ REQUIRED_VARS APR_LIBRARIES APR_INCLUDE_DIR
VERSION_VAR APR_VERSION)
if(APR_FOUND)
@@ -257,7 +256,7 @@ if(NOT _apru_include_only_utilities)
if(APR_LIBRARIES AND APR_RUNTIME_LIBS)
add_library(APR::APR SHARED IMPORTED)
set_target_properties(APR::APR PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${APR_INCLUDES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${APR_INCLUDE_DIR}"
IMPORTED_LOCATION "${APR_RUNTIME_LIBS}"
IMPORTED_IMPLIB "${APR_LIBRARIES}")
endif()
@@ -267,9 +266,10 @@ if(NOT _apru_include_only_utilities)
add_library(APR::APR_static STATIC IMPORTED)
set_target_properties(APR::APR_static PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "APR_DECLARE_STATIC"
- INTERFACE_INCLUDE_DIRECTORIES "${APR_INCLUDES}"
- IMPORTED_INTERFACE_LINK_LIBRARIES "${_apr_extra}"
+ INTERFACE_INCLUDE_DIRECTORIES "${APR_INCLUDE_DIR}"
IMPORTED_LOCATION "${_apr_static}")
+ target_link_libraries(APR::APR_static
+ INTERFACE ${_apr_extra})
endif()
else() # NOT Windows
@@ -277,9 +277,10 @@ if(NOT _apru_include_only_utilities)
_apru_location(_apr_library _apr_extra "${APR_LIBRARIES}")
add_library(APR::APR UNKNOWN IMPORTED)
set_target_properties(APR::APR PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${APR_INCLUDES}"
- INTERFACE_LINK_LIBRARIES
"${APR_LDFLAGS};${APR_EXTRALIBS};${_apr_extra}"
+ INTERFACE_INCLUDE_DIRECTORIES "${APR_INCLUDE_DIR}"
IMPORTED_LOCATION "${_apr_library}")
+ target_link_libraries(APR::APR
+ INTERFACE ${APR_EXTRALIBS} ${_apr_extra})
endif() # NOT Windows
endif(APR_FOUND)
Modified: serf/trunk/build/FindAPRUtil.cmake
URL:
http://svn.apache.org/viewvc/serf/trunk/build/FindAPRUtil.cmake?rev=1927297&r1=1927296&r2=1927297&view=diff
==============================================================================
--- serf/trunk/build/FindAPRUtil.cmake (original)
+++ serf/trunk/build/FindAPRUtil.cmake Thu Jul 17 22:43:22 2025
@@ -41,7 +41,7 @@ cmake_minimum_required(VERSION 3.12)
#
# APRUtil_FOUND - True if APR-Util was found
# APRUTIL_VERSION - The version of APR-Util found (x.y.z)
-# APRUTIL_INCLUDES - Where to find apr.h, etc.
+# APRUTIL_INCLUDE_DIR - Where to find apr.h, etc.
# APRUTIL_LIBRARIES - Linker switches to use with ld to link against APR
#
# ::
@@ -83,7 +83,7 @@ else(APR_CONTAINS_APRUTIL)
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- _apru_find_win_version("apu" APRUTIL_INCLUDES
+ _apru_find_win_version("apu" APRUTIL_INCLUDE_DIR
APRUTIL_VERSION _apu_major _apu_minor)
set(_apu_name "aprutil-${_apu_major}")
@@ -122,18 +122,17 @@ else(APR_CONTAINS_APRUTIL)
_apru_config(${APRUTIL_CONFIG_EXECUTABLE} ${_varname} "${_regexp}"
"${ARGN}")
endmacro(_apu_invoke)
- _apu_invoke(APRUTIL_INCLUDES "(^| )-I" --includes)
- _apu_invoke(APRUTIL_EXTRALIBS "" --libs)
- _apu_invoke(APRUTIL_LIBRARIES "" --link-ld)
- _apu_invoke(APRUTIL_LDFLAGS "" --ldflags)
- _apu_invoke(APRUTIL_VERSION "" --version)
+ _apu_invoke(APRUTIL_INCLUDE_DIR "" --includedir)
+ _apu_invoke(APRUTIL_EXTRALIBS "" --libs)
+ _apu_invoke(APRUTIL_LIBRARIES "" --link-ld)
+ _apu_invoke(APRUTIL_VERSION "" --version)
endif() # NOT Windows
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
APRUtil
- REQUIRED_VARS APRUTIL_LIBRARIES APRUTIL_INCLUDES
+ REQUIRED_VARS APRUTIL_LIBRARIES APRUTIL_INCLUDE_DIR
VERSION_VAR APRUTIL_VERSION)
if(APRUtil_FOUND)
@@ -142,7 +141,7 @@ else(APR_CONTAINS_APRUTIL)
if(APRUTIL_LIBRARIES AND APRUTIL_RUNTIME_LIBS)
add_library(APR::APRUtil SHARED IMPORTED)
set_target_properties(APR::APRUtil PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${APRUTIL_INCLUDES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${APRUTIL_INCLUDE_DIR}"
IMPORTED_LOCATION "${APRUTIL_RUNTIME_LIBS}"
IMPORTED_IMPLIB "${APRUTIL_LIBRARIES}")
if(TARGET APR::APR)
@@ -159,7 +158,7 @@ else(APR_CONTAINS_APRUTIL)
add_library(APR::APRUtil_static STATIC IMPORTED)
set_target_properties(APR::APRUtil_static PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "APU_DECLARE_STATIC"
- INTERFACE_INCLUDE_DIRECTORIES "${APRUTIL_INCLUDES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${APRUTIL_INCLUDE_DIR}"
IMPORTED_LOCATION "${_apu_static}")
target_link_libraries(APR::APRUtil_static
INTERFACE ${_apu_extra})
@@ -170,10 +169,10 @@ else(APR_CONTAINS_APRUTIL)
_apru_location(_apu_library _apu_extra "${APRUTIL_LIBRARIES}")
add_library(APR::APRUtil UNKNOWN IMPORTED)
set_target_properties(APR::APRUtil PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${APRUTIL_INCLUDES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${APRUTIL_INCLUDE_DIR}"
IMPORTED_LOCATION "${_apu_library}")
target_link_libraries(APR::APRUtil
- INTERFACE ${APRUTIL_LDFLAGS};${APRUTIL_EXTRALIBS};${_apu_extra})
+ INTERFACE ${APRUTIL_EXTRALIBS} ${_apu_extra})
endif() # NOT Windows
endif(APRUtil_FOUND)
Modified: serf/trunk/build/SerfGenClangd.cmake
URL:
http://svn.apache.org/viewvc/serf/trunk/build/SerfGenClangd.cmake?rev=1927297&r1=1927296&r2=1927297&view=diff
==============================================================================
--- serf/trunk/build/SerfGenClangd.cmake (original)
+++ serf/trunk/build/SerfGenClangd.cmake Thu Jul 17 22:43:22 2025
@@ -55,9 +55,9 @@ function(SerfGenClangd)
write_flags("--language=c")
write_includes("${CMAKE_SOURCE_DIR}")
- list(APPEND includes ${APR_INCLUDES})
+ list(APPEND includes ${APR_INCLUDE_DIR})
if(NOT APR_CONTAINS_APRUTIL)
- list(APPEND includes ${APRUTIL_INCLUDES})
+ list(APPEND includes ${APRUTIL_INCLUDE_DIR})
endif()
list(APPEND includes ${OPENSSL_INCLUDE_DIR})
list(APPEND includes ${ZLIB_INCLUDE_DIR})
