Author: rinrab
Date: Sat Jul 6 11:59:51 2024
New Revision: 1918964
URL: http://svn.apache.org/viewvc?rev=1918964&view=rev
Log:
On the 'cmake' branch: Read package version of APR and APR-Util libraries.
* build/cmake/FindAPR.cmake,
build/cmake/FindAPRUtil.cmake
(version): Do little magic with CMake and regexes to read version.
(FIND_PACKAGE_HANDLE_STANDARD_ARGS): Setup VERSION_VAR to
APR_VERSION/APRUTIL_VERSION.
Modified:
subversion/branches/cmake/build/cmake/FindAPR.cmake
subversion/branches/cmake/build/cmake/FindAPRUtil.cmake
Modified: subversion/branches/cmake/build/cmake/FindAPR.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/FindAPR.cmake?rev=1918964&r1=1918963&r2=1918964&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPR.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPR.cmake Sat Jul 6 11:59:51 2024
@@ -47,6 +47,17 @@ elseif(APR_LIBRARY_STATIC)
set(APR_LIBRARY ${APR_LIBRARY_STATIC})
endif()
+file(
+ STRINGS "${APR_INCLUDE_DIR}/apr_version.h" VERSION_STRINGS
+ REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)"
+)
+
+string(REGEX REPLACE ".*APR_MAJOR_VERSION +([0-9]+).*" "\\1" APR_MAJOR_VERSION
${VERSION_STRINGS})
+string(REGEX REPLACE ".*APR_MINOR_VERSION +([0-9]+).*" "\\1" APR_MINOR_VERSION
${VERSION_STRINGS})
+string(REGEX REPLACE ".*APR_PATCH_VERSION +([0-9]+).*" "\\1" APR_PATCH_VERSION
${VERSION_STRINGS})
+
+set(APR_VERSION
"${APR_MAJOR_VERSION}.${APR_MINOR_VERSION}.${APR_PATCH_VERSION}")
+
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
@@ -54,6 +65,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
REQUIRED_VARS
APR_LIBRARY
APR_INCLUDE_DIR
+ VERSION_VAR
+ APR_VERSION
)
if(APR_FOUND)
Modified: subversion/branches/cmake/build/cmake/FindAPRUtil.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/FindAPRUtil.cmake?rev=1918964&r1=1918963&r2=1918964&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPRUtil.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPRUtil.cmake Sat Jul 6 11:59:51
2024
@@ -47,6 +47,17 @@ elseif(APRUTIL_LIBRARY_STATIC)
set(APRUTIL_LIBRARY ${APRUTIL_LIBRARY_STATIC})
endif()
+file(
+ STRINGS "${APRUTIL_INCLUDE_DIR}/apu_version.h" VERSION_STRINGS
+ REGEX "#define (APU_MAJOR_VERSION|APU_MINOR_VERSION|APU_PATCH_VERSION)"
+)
+
+string(REGEX REPLACE ".*APU_MAJOR_VERSION +([0-9]+).*" "\\1" APU_MAJOR_VERSION
${VERSION_STRINGS})
+string(REGEX REPLACE ".*APU_MINOR_VERSION +([0-9]+).*" "\\1" APU_MINOR_VERSION
${VERSION_STRINGS})
+string(REGEX REPLACE ".*APU_PATCH_VERSION +([0-9]+).*" "\\1" APU_PATCH_VERSION
${VERSION_STRINGS})
+
+set(APRUTIL_VERSION
"${APU_MAJOR_VERSION}.${APU_MINOR_VERSION}.${APU_PATCH_VERSION}")
+
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
@@ -54,6 +65,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
REQUIRED_VARS
APRUTIL_LIBRARY
APRUTIL_INCLUDE_DIR
+ VERSION_VAR
+ APRUTIL_VERSION
)
if(APRUtil_FOUND)
