svn commit: r1521958 - in /apr/apr/branches/1.4.x: CMakeLists.txt README.cmake

[tr...@apache.org]

Author: trawick
Date: Wed Sep 11 18:00:46 2013
New Revision: 1521958

URL: http://svn.apache.org/r1521958
Log:
mostly from trunk r1521957: install .pdb files unless requested otherwise, tweak todo list

Modified:
    apr/apr/branches/1.4.x/CMakeLists.txt
    apr/apr/branches/1.4.x/README.cmake

Modified: apr/apr/branches/1.4.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CMakeLists.txt?rev=1521958&r1=1521957&r2=1521958&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.4.x/CMakeLists.txt Wed Sep 11 18:00:46 2013
@@ -21,6 +21,7 @@ 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(INSTALL_PDB          "Install .pdb files (if generated)"  ON)
 OPTION(APR_BUILD_TESTAPR    "Build the test suite"         OFF)
 SET(MIN_WINDOWS_VER             "Vista" 
     CACHE STRING "Minimum Windows version")
@@ -235,15 +236,19 @@ SET(APR_TEST_SOURCES
 )
 
 SET(install_targets)
+SET(install_bin_pdb)
+SET(install_lib_pdb)
 
 # libapr-1 is shared, apr-1 is static
 ADD_LIBRARY(libapr-1 SHARED ${APR_HEADERS} ${APR_SOURCES} ${PROJECT_BINARY_DIR}/apr.h)
 SET(install_targets ${install_targets} libapr-1)
+SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb)
 TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT")
 
 ADD_LIBRARY(apr-1 STATIC ${APR_HEADERS} ${APR_SOURCES} ${PROJECT_BINARY_DIR}/apr.h)
 SET(install_targets ${install_targets} apr-1)
+SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/apr-1.pdb)
 TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC")
 
@@ -301,6 +306,16 @@ INSTALL(TARGETS ${install_targets}
         ARCHIVE DESTINATION lib
        )
 
+IF(INSTALL_PDB)
+  INSTALL(FILES ${install_bin_pdb}
+          DESTINATION bin
+          CONFIGURATIONS RelWithDebInfo Debug)
+
+  INSTALL(FILES ${install_lib_pdb}
+          DESTINATION lib
+          CONFIGURATIONS RelWithDebInfo Debug)
+ENDIF()
+
 INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
 IF(APR_INSTALL_PRIVATE_H)
   # Kludges for unexpected dependencies of httpd 2.x, not installed by default
@@ -319,6 +334,8 @@ MESSAGE(STATUS "")
 MESSAGE(STATUS "")
 MESSAGE(STATUS "APR configuration summary:")
 MESSAGE(STATUS "")
+MESSAGE(STATUS "  Build type ...................... : ${CMAKE_BUILD_TYPE}")
+MESSAGE(STATUS "  Install .pdb (if available)...... : ${INSTALL_PDB}")
 MESSAGE(STATUS "  Install prefix .................. : ${CMAKE_INSTALL_PREFIX}")
 MESSAGE(STATUS "  C compiler ...................... : ${CMAKE_C_COMPILER}")
 MESSAGE(STATUS "  IPv6 ............................ : ${APR_HAVE_IPV6}")

Modified: apr/apr/branches/1.4.x/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/README.cmake?rev=1521958&r1=1521957&r2=1521958&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/README.cmake (original)
+++ apr/apr/branches/1.4.x/README.cmake Wed Sep 11 18:00:46 2013
@@ -69,6 +69,8 @@ How to build
                               refer to
                               http://msdn.microsoft.com/en-us/library/windows/
                               desktop/aa383745(v=vs.85).aspx
+       INSTALL_PDB            Install .pdb files if generated.
+                              Default: ON
 
    CMAKE_C_FLAGS_RELEASE, _DEBUG, _RELWITHDEBINFO, _MINSIZEREL
 
@@ -87,24 +89,12 @@ 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:
-    . APU_HAVE_GDBM
-    . APU_HAVE_NDBM
-    . APU_HAVE_DB
-  + DBD:
-    . APU_HAVE_PGSQL
-    . APU_HAVE_MYSQL
-    . APU_HAVE_SQLITE3
-    . APU_HAVE_SQLITE2
-    . APU_HAVE_ORACLE
-  + CRYPTO:
-    . APU_HAVE_NSS
 * No test program build to use libapr-1.dll is created.
 * No script or other mechanism is provided to run the test suite.
-* APR_CHANGES.txt, APR-LICENSE.txt, and APR-NOTICE.txt are not installed.
+* APR-CHANGES.txt, APR-LICENSE.txt, and APR-NOTICE.txt are not installed,
+  though perhaps that is a job for a higher-level script.
 * test/internal/testucs is not built.
 
 Generally: