summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2013-09-10 12:28:55 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2013-09-10 12:28:55 +0000
commit0cad1126a81ca05d3f5581452132e0419d1fb181 (patch)
treeace41989331784a8ea7be745ca7b7a55d1e6e0d3 /CMakeLists.txt
parent5d87b6a364da6f092a34d260cccf256b995aa84a (diff)
downloadlibapr-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
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt25
1 files changed, 11 insertions, 14 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}")