diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-08-23 15:44:51 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-08-23 15:44:51 +0000 |
| commit | f9e41bc4da25a1bf04c0774ec8568dfe2ec12950 (patch) | |
| tree | bff0f62e4e0486b06d68a365d08b89cff66e6367 /CMakeLists.txt | |
| parent | ad563de839bdaf5ef36b21a7397aeaab1175e73a (diff) | |
| download | libapr-f9e41bc4da25a1bf04c0774ec8568dfe2ec12950.tar.gz | |
Change the way that private .h files used by httpd are installed.
Instead of always installing them and putting them under private_include,
install under include but only if a new option is enabled.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1516901 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6308d6048..b1f10d6a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,7 @@ ELSE() OPTION(APU_USE_LIBXML2 "Use LibXml2" ON) ENDIF() +OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF) OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON) OPTION(APR_HAVE_IPV6 "IPv6 support" ON) OPTION(APR_SHOW_SETTINGS "Show the build configuration" ON) @@ -473,11 +474,16 @@ INSTALL(TARGETS ${install_targets} ) INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) -# Kludges for unexpected dependencies of httpd 2.x; at least segregate them in private_include -INSTALL(FILES include/arch/win32/apr_arch_file_io.h DESTINATION private_include/arch/win32) -INSTALL(FILES include/arch/win32/apr_arch_utf8.h DESTINATION private_include/arch/win32) -INSTALL(FILES include/arch/win32/apr_private.h DESTINATION private_include/arch/win32) -INSTALL(FILES include/arch/win32/apr_arch_misc.h DESTINATION private_include/arch/win32) +IF(APR_INSTALL_PRIVATE_H) + # Kludges for unexpected dependencies of httpd 2.x, not installed by default + SET(APR_PRIVATE_H_FOR_HTTPD + include/arch/win32/apr_arch_file_io.h + include/arch/win32/apr_arch_misc.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) +ENDIF() IF(APR_SHOW_SETTINGS) STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) @@ -493,4 +499,5 @@ IF(APR_SHOW_SETTINGS) MESSAGE(STATUS " Use LibXml2 ..................... : ${APU_USE_LIBXML2}") MESSAGE(STATUS " Library files for XML ........... : ${XMLLIB_LIBRARIES}") MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") + MESSAGE(STATUS " Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}") ENDIF(APR_SHOW_SETTINGS) |