Hi Mladen, you tweaked this, and failed to update build/find_apr.m4, so this broke CMake builds of httpd against APR. httpd simply borrows what apr provides, so it isn't on that project.
Are you able to update the find macro appropriately so it functions to discover the true path of apr, or should this be reverted? Thanks, Bill On Thu, Dec 2, 2021 at 11:19 PM <mt...@apache.org> wrote: > > Author: mturk > Date: Fri Dec 3 05:19:47 2021 > New Revision: 1895528 > > URL: http://svn.apache.org/viewvc?rev=1895528&view=rev > Log: > Use the correct location for installing apr-2 headers (same layout as on > nixes) > > Modified: > apr/apr/trunk/CMakeLists.txt > > Modified: apr/apr/trunk/CMakeLists.txt > URL: > http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1895528&r1=1895527&r2=1895528&view=diff > ============================================================================== > --- apr/apr/trunk/CMakeLists.txt (original) > +++ apr/apr/trunk/CMakeLists.txt Fri Dec 3 05:19:47 2021 > @@ -17,7 +17,7 @@ > > PROJECT(APR C) > > -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) > +CMAKE_MINIMUM_REQUIRED(VERSION 3.0) > > OPTION(APR_MINIMAL_BUILD "Create minimal APR build" OFF) > IF(NOT APR_MINIMAL_BUILD) > @@ -664,7 +664,7 @@ IF(INSTALL_PDB) > CONFIGURATIONS RelWithDebInfo Debug) > ENDIF() > > -INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} > DESTINATION include) > +INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} > DESTINATION include/apr-2) > IF(APR_INSTALL_PRIVATE_H) > # Kludges for unexpected dependencies of httpd 2.x, not installed by > default > SET(APR_PRIVATE_H_FOR_HTTPD > @@ -673,7 +673,7 @@ IF(APR_INSTALL_PRIVATE_H) > include/arch/win32/apr_arch_utf8.h > include/arch/win32/apr_private.h > ) > - INSTALL(FILES ${APR_PRIVATE_H_FOR_HTTPD} DESTINATION include/arch/win32) > + INSTALL(FILES ${APR_PRIVATE_H_FOR_HTTPD} DESTINATION > include/apr-2/arch/win32) > ENDIF() > > STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) > >
