svn commit: r1521464 - in /apr/apr-util/branches/1.5.x: CMakeLists.txt README.cmake

[tr...@apache.org]

Author: trawick
Date: Tue Sep 10 12:29:20 2013
New Revision: 1521464

URL: http://svn.apache.org/r1521464
Log:
from trunk r1521461: remove the ability to suppress the build setting display, tweak the todo list

Modified:
    apr/apr-util/branches/1.5.x/CMakeLists.txt
    apr/apr-util/branches/1.5.x/README.cmake

Modified: apr/apr-util/branches/1.5.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CMakeLists.txt?rev=1521464&r1=1521463&r2=1521464&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.5.x/CMakeLists.txt Tue Sep 10 12:29:20 2013
@@ -24,7 +24,6 @@ FIND_PACKAGE(OpenSSL)
 OPTION(APU_HAVE_CRYPTO      "Crypto support"                            OFF)
 OPTION(APU_HAVE_ODBC        "Build ODBC DBD driver"                     ON)
 OPTION(APR_HAS_LDAP         "LDAP support"                              ON)
-OPTION(APR_SHOW_SETTINGS    "Show the build configuration"              ON)
 OPTION(APR_BUILD_TESTAPR    "Build the test suite"                      OFF)
 SET(APR_INCLUDE_DIR         "${CMAKE_INSTALL_PREFIX}/include"           CACHE STRING "Directory with APR include files")
 SET(APR_LIBRARIES           "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib"  CACHE STRING "APR library to link with")
@@ -287,18 +286,16 @@ INSTALL(TARGETS ${install_targets}
 
 INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
 
-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 "  APR include directory ........... : ${APR_INCLUDE_DIR}")
-  MESSAGE(STATUS "  APR libraries ................... : ${APR_LIBRARIES}")
-  MESSAGE(STATUS "  DBD ODBC driver ................. : ${APU_HAVE_ODBC}")
-  MESSAGE(STATUS "  APU_HAVE_CRYPTO ................. : ${APU_HAVE_CRYPTO}")
-  MESSAGE(STATUS "  APR_HAS_LDAP .................... : ${APR_HAS_LDAP}")
-  MESSAGE(STATUS "  Build test suite ................ : ${APR_BUILD_TESTAPR}")
-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 "  APR include directory ........... : ${APR_INCLUDE_DIR}")
+MESSAGE(STATUS "  APR libraries ................... : ${APR_LIBRARIES}")
+MESSAGE(STATUS "  DBD ODBC driver ................. : ${APU_HAVE_ODBC}")
+MESSAGE(STATUS "  APU_HAVE_CRYPTO ................. : ${APU_HAVE_CRYPTO}")
+MESSAGE(STATUS "  APR_HAS_LDAP .................... : ${APR_HAS_LDAP}")
+MESSAGE(STATUS "  Build test suite ................ : ${APR_BUILD_TESTAPR}")

Modified: apr/apr-util/branches/1.5.x/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/README.cmake?rev=1521464&r1=1521463&r2=1521464&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/README.cmake (original)
+++ apr/apr-util/branches/1.5.x/README.cmake Tue Sep 10 12:29:20 2013
@@ -77,9 +77,6 @@ How to build
                               Default: OFF
        APU_HAVE_ODBC          Build ODBC DBD driver
                               Default: ON
-       APR_SHOW_SETTINGS      Display key build settings at the end of build
-                              generation
-                              Default: ON
        APR_BUILD_TESTAPR      Build APR-Util test suite
                               Default: OFF
 
@@ -99,6 +96,7 @@ Known Bugs and Limitations
 * If include/apu.h or other generated files have been created in the source
   directory by another build system, they will be used unexpectedly and
   cause the build to fail.
+* .pdb files are not installed
 * Options should be provided for remaining features, along with finding any
   necessary libraries
   + DBM:
@@ -113,11 +111,13 @@ Known Bugs and Limitations
     . APU_HAVE_ORACLE
   + CRYPTO:
     . APU_HAVE_NSS
-  + XLATE, APU_HAVE_ICONV
+  + XLATE, APU_HAVE_ICONV (no way to consume an apr-iconv build yet)
 * Static builds of APR modules are not supported.
 * No test program build to use libaprutil-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.
+  (but unlike Makefile.win we want to call them APR-Util-CHANGES.txt
+  and so on)
 
 Generally: