Author: brane
Date: Sat Aug  2 11:06:03 2025
New Revision: 1927581

Log:
In the CMake build, fix APR (2.x) and APR-Util with external modules.

* build/FindAPR.cmake
  (APR_EXTRALIBS): Also include --ldflags for linking dependent libraries.
* build/FindAPRUtil.cmake
  (APRUTIL_EXTRALIBS): Likewise.

Modified:
   serf/trunk/build/FindAPR.cmake
   serf/trunk/build/FindAPRUtil.cmake

Modified: serf/trunk/build/FindAPR.cmake
==============================================================================
--- serf/trunk/build/FindAPR.cmake      Sat Aug  2 08:30:25 2025        
(r1927580)
+++ serf/trunk/build/FindAPR.cmake      Sat Aug  2 11:06:03 2025        
(r1927581)
@@ -232,7 +232,7 @@ if(NOT _apru_include_only_utilities)
     _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_EXTRALIBS   ""                 --ldflags --libs)
     _apr_invoke(APR_VERSION     ""                 --version)
     string(REGEX REPLACE "^([0-9]+)\\..*$" "\\1" _apr_major "${APR_VERSION}")
 

Modified: serf/trunk/build/FindAPRUtil.cmake
==============================================================================
--- serf/trunk/build/FindAPRUtil.cmake  Sat Aug  2 08:30:25 2025        
(r1927580)
+++ serf/trunk/build/FindAPRUtil.cmake  Sat Aug  2 11:06:03 2025        
(r1927581)
@@ -123,7 +123,7 @@ else(APR_CONTAINS_APRUTIL)
     endmacro(_apu_invoke)
 
     _apu_invoke(APRUTIL_INCLUDE_DIR  ""  --includedir)
-    _apu_invoke(APRUTIL_EXTRALIBS    ""  --libs)
+    _apu_invoke(APRUTIL_EXTRALIBS    ""  --ldflags --libs)
     _apu_invoke(APRUTIL_LIBRARIES    ""  --link-ld)
     _apu_invoke(APRUTIL_VERSION      ""  --version)
 

Reply via email to