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

[tr...@apache.org]

Author: trawick
Date: Sun Sep 15 00:32:18 2013
New Revision: 1523373

URL: http://svn.apache.org/r1523373
Log:
backport of r1523355: build aprapp-2.lib and libaprapp-1.lib

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=1523373&r1=1523372&r2=1523373&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.4.x/CMakeLists.txt Sun Sep 15 00:32:18 2013
@@ -252,6 +252,17 @@ SET(install_lib_pdb ${install_lib_pdb} $
 TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC")
 
+# libaprapp-1 and aprapp-1 are static
+ADD_LIBRARY(libaprapp-1 STATIC ${APR_HEADERS} ${PROJECT_BINARY_DIR}/apr.h misc/win32/apr_app.c misc/win32/internal.c)
+SET(install_targets ${install_targets} libaprapp-1)
+SET(install_lib_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb)
+SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS APR_APP)
+
+ADD_LIBRARY(aprapp-1 STATIC ${APR_HEADERS} ${PROJECT_BINARY_DIR}/apr.h misc/win32/apr_app.c)
+SET(install_targets ${install_targets} aprapp-1)
+SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-1.pdb)
+SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP")
+
 IF(APR_BUILD_TESTAPR)
   EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/data)
   EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/test/data/file_datafile.txt ${PROJECT_BINARY_DIR}/data/file_datafile.txt)

Modified: apr/apr/branches/1.4.x/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/README.cmake?rev=1523373&r1=1523372&r2=1523373&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/README.cmake (original)
+++ apr/apr/branches/1.4.x/README.cmake Sun Sep 15 00:32:18 2013
@@ -88,7 +88,6 @@ Known Bugs and Limitations
 * If include/apr.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.
-* apr_app.c, aprapp-1.lib, and libaprapp-1.lib are not handled properly.
 * Options should be provided for remaining features:
   + APR_POOL_DEBUG
 * No test program build to use libapr-1.dll is created.