Author: rinrab
Date: Tue Jul 9 14:01:29 2024
New Revision: 1919062
URL: http://svn.apache.org/viewvc?rev=1919062&view=rev
Log:
On the 'cmake' branch: Support Debian-style include directories of APR and
APR-Util libraries.
On Debian by the `apt install libapr1-dev` command APR includes would be
installed to `/usr/include/apr-1.0/` directory. This commit adds include/apr-1.0
to PATH_SUFFIXES to support this.
* build/cmake/FindAPR.cmake,
build/cmake/FindAPRUtil.cmake
(find include directory): Add `include/apr-1.0` to PATH_SUFFIXES.
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=1919062&r1=1919061&r2=1919062&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPR.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPR.cmake Tue Jul 9 14:01:29 2024
@@ -24,6 +24,7 @@ find_path(APR_INCLUDE_DIR
PATH_SUFFIXES
include
include/apr-1
+ include/apr-1.0
)
find_library(APR_LIBRARY_SHARED
Modified: subversion/branches/cmake/build/cmake/FindAPRUtil.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/FindAPRUtil.cmake?rev=1919062&r1=1919061&r2=1919062&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPRUtil.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPRUtil.cmake Tue Jul 9 14:01:29
2024
@@ -24,6 +24,7 @@ find_path(APRUTIL_INCLUDE_DIR
PATH_SUFFIXES
include
include/apr-1 # Not yet in apr
+ include/apr-1.0
)
find_library(APRUTIL_LIBRARY_SHARED
