svn commit: r1926350 - /subversion/trunk/CMakeLists.txt

Author: rinrab
Date: Tue Jun 10 22:07:50 2025
New Revision: 1926350

URL: http://svn.apache.org/viewvc?rev=1926350&view=rev
Log:
cmake: Prevent re-definition of APR and Serf targets by using different
prefixes for version '1' and '2'.

* CMakeLists.txt
  (APR, Serf): Bunch of cmake magic.

Modified:
    subversion/trunk/CMakeLists.txt

Modified: subversion/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1926350&r1=1926349&r2=1926350&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Tue Jun 10 22:07:50 2025
@@ -263,19 +263,19 @@ endif()
 ### APR and APR-Util
 
 if(SVN_USE_PKG_CONFIG)
-  pkg_check_modules(apr IMPORTED_TARGET apr-1)
+  pkg_check_modules(apr1 IMPORTED_TARGET apr-1)
 
-  if(apr_FOUND)
+  if(apr1_FOUND)
     # apr-1
-    add_library(external-apr ALIAS PkgConfig::apr)
+    add_library(external-apr ALIAS PkgConfig::apr1)
 
     pkg_check_modules(aprutil-1 REQUIRED IMPORTED_TARGET apr-util-1)
     add_library(external-aprutil ALIAS PkgConfig::aprutil-1)
   else()
     # apr-2
-    pkg_check_modules(apr REQUIRED IMPORTED_TARGET apr-2)
-    add_library(external-apr ALIAS PkgConfig::apr)
-    add_library(external-aprutil ALIAS PkgConfig::apr)
+    pkg_check_modules(apr2 REQUIRED IMPORTED_TARGET apr-2)
+    add_library(external-apr ALIAS PkgConfig::apr2)
+    add_library(external-aprutil ALIAS PkgConfig::apr2)
   endif()
 else()
   find_package(APR REQUIRED)
@@ -375,14 +375,16 @@ endif()
 ### Serf
 if (SVN_ENABLE_RA_SERF)
   if(SVN_USE_PKG_CONFIG)
-    pkg_check_modules(serf IMPORTED_TARGET serf-1)
+    pkg_check_modules(serf1 IMPORTED_TARGET serf-1)
 
-    # Try serf-2 instead?
-    if(NOT serf_FOUND)
-      pkg_check_modules(serf REQUIRED IMPORTED_TARGET serf-2)
+    if(serf1_FOUND)
+      # serf-1
+      add_library(external-serf ALIAS PkgConfig::serf1)
+    else()
+      # serf-2
+      pkg_check_modules(serf2 REQUIRED IMPORTED_TARGET serf-2)
+      add_library(external-serf ALIAS PkgConfig::serf2)
     endif()
-
-    add_library(external-serf ALIAS PkgConfig::serf)
   else()
     find_package(Serf REQUIRED)
     add_library(external-serf ALIAS Serf::Serf)