Author: rinrab
Date: Thu Dec 11 18:18:28 2025
New Revision: 1930447
Log:
cmake: Look for specific versin of Serf based on the header file we just found.
* build/cmake/FindSerf.cmake
(version): Add case in which the version will be set to 1.0.0 if no valid
header file was found.
(find_library): Use the SERF_MAJOR_VERSION constant to construct library name
to look for.
Modified:
subversion/trunk/build/cmake/FindSerf.cmake
Modified: subversion/trunk/build/cmake/FindSerf.cmake
==============================================================================
--- subversion/trunk/build/cmake/FindSerf.cmake Thu Dec 11 12:45:02 2025
(r1930446)
+++ subversion/trunk/build/cmake/FindSerf.cmake Thu Dec 11 18:18:28 2025
(r1930447)
@@ -32,11 +32,6 @@ find_path(Serf_INCLUDE_DIR
"${CMAKE_INSTALL_INCLUDEDIR}/serf-1"
)
-find_library(Serf_LIBRARY
- NAMES serf-2 serf-1
- PATH_SUFFIXES lib "${CMAKE_INSTALL_LIBDIR}"
-)
-
mark_as_advanced(
Serf_INCLUDE_DIR
Serf_LIBRARY
@@ -53,10 +48,20 @@ if (Serf_INCLUDE_DIR AND EXISTS ${Serf_I
string(REGEX REPLACE ".*SERF_MAJOR_VERSION +([0-9]+).*" "\\1"
SERF_MAJOR_VERSION ${VERSION_STRINGS})
string(REGEX REPLACE ".*SERF_MINOR_VERSION +([0-9]+).*" "\\1"
SERF_MINOR_VERSION ${VERSION_STRINGS})
string(REGEX REPLACE ".*SERF_PATCH_VERSION +([0-9]+).*" "\\1"
SERF_PATCH_VERSION ${VERSION_STRINGS})
-
- set(Serf_VERSION
"${SERF_MAJOR_VERSION}.${SERF_MINOR_VERSION}.${SERF_PATCH_VERSION}")
+else()
+ # Default version to 1.0.0 if not found.
+ set(SERF_MAJOR_VERSION 1)
+ set(SERF_MINOR_VERSION 0)
+ set(SERF_PATCH_VERSION 0)
endif()
+set(Serf_VERSION
"${SERF_MAJOR_VERSION}.${SERF_MINOR_VERSION}.${SERF_PATCH_VERSION}")
+
+find_library(Serf_LIBRARY
+ NAMES "serf-${SERF_MAJOR_VERSION}"
+ PATH_SUFFIXES lib "${CMAKE_INSTALL_LIBDIR}"
+)
+
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
