Den mån 30 juni 2025 kl 14:38 skrev Timofei Zhakov <t...@chemodax.net>: [...snip...]
> > As I understand it, some package distributions provide APR's package > config files with names like apr1 and aprutil1 (without spaces). Since we > are already using a function that supports search for multiple names, we > could handle it simply. See the patch below. > > [[[ > Index: CMakeLists.txt > =================================================================== > --- CMakeLists.txt (revision 1926871) > +++ CMakeLists.txt (working copy) > @@ -263,12 +263,12 @@ > ### APR and APR-Util > > if(SVN_USE_PKG_CONFIG) > - pkg_search_module(apr REQUIRED IMPORTED_TARGET apr-2 apr-1) > + pkg_search_module(apr REQUIRED IMPORTED_TARGET apr-2 apr2 apr-1 apr1) > add_library(external-apr ALIAS PkgConfig::apr) > > if(APR_VERSION VERSION_LESS 2.0.0) > # apr-1 > - pkg_check_modules(aprutil-1 REQUIRED IMPORTED_TARGET apr-util-1) > + pkg_search_module(aprutil-1 REQUIRED IMPORTED_TARGET aprutil1) > add_library(external-aprutil ALIAS PkgConfig::aprutil-1) > else() > # apr-2 > ]]] > > Thoughts? > I can't see it does any harm, except I suppose you accidentally deleted apr-util-1 in the second half of the patch. Cheers, Daniel
