diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-09-10 12:28:55 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-09-10 12:28:55 +0000 |
| commit | 0cad1126a81ca05d3f5581452132e0419d1fb181 (patch) | |
| tree | ace41989331784a8ea7be745ca7b7a55d1e6e0d3 | |
| parent | 5d87b6a364da6f092a34d260cccf256b995aa84a (diff) | |
| download | libapr-0cad1126a81ca05d3f5581452132e0419d1fb181.tar.gz | |
from trunk r1521461: remove the ability to suppress the build setting display, tweak the todo list
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1521462 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CMakeLists.txt | 25 | ||||
| -rw-r--r-- | README.cmake | 7 |
2 files changed, 13 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f29685d60..fc0fda656 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF) OPTION(APR_HAVE_IPV6 "IPv6 support" ON) -OPTION(APR_SHOW_SETTINGS "Show the build configuration" ON) OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) SET(MIN_WINDOWS_VER "Vista" CACHE STRING "Minimum Windows version") @@ -315,16 +314,14 @@ IF(APR_INSTALL_PRIVATE_H) INSTALL(FILES include/arch/apr_private_common.h DESTINATION include/arch) ENDIF() -IF(APR_SHOW_SETTINGS) - STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) - MESSAGE(STATUS "") - MESSAGE(STATUS "") - MESSAGE(STATUS "APR configuration summary:") - MESSAGE(STATUS "") - MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") - MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") - MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") - MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") - MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") - MESSAGE(STATUS " Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}") -ENDIF(APR_SHOW_SETTINGS) +STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) +MESSAGE(STATUS "") +MESSAGE(STATUS "") +MESSAGE(STATUS "APR configuration summary:") +MESSAGE(STATUS "") +MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") +MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") +MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") +MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") +MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") +MESSAGE(STATUS " Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}") diff --git a/README.cmake b/README.cmake index c52ec224d..f67743589 100644 --- a/README.cmake +++ b/README.cmake @@ -58,9 +58,6 @@ How to build Default: OFF APR_HAVE_IPV6 Enable IPv6 support Default: ON - APR_SHOW_SETTINGS Display key build settings at the end of build - generation - Default: ON APR_BUILD_TESTAPR Build APR test suite Default: OFF MIN_WINDOWS_VER Minimum Windows version supported by this build @@ -90,6 +87,7 @@ Known Bugs and Limitations directory by another build system, they will be used unexpectedly and cause the build to fail. * apr_app.c, aprapp-1.lib, and libaprapp-1.lib are not handled properly. +* .pdb files are not installed * Options should be provided for remaining features: + APR_POOL_DEBUG + DBM: @@ -104,10 +102,9 @@ Known Bugs and Limitations . APU_HAVE_ORACLE + CRYPTO: . APU_HAVE_NSS - + APU_HAVE_ICONV * No test program build to use libapr-1.dll is created. * No script or other mechanism is provided to run the test suite. -* CHANGES/LICENSE/NOTICE is not installed, unlike Makefile.win. +* APR_CHANGES.txt, APR-LICENSE.txt, and APR-NOTICE.txt are not installed. * test/internal/testucs is not built. Generally: |