apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1523355 - in /apr/apr/trunk: CMakeLists.txt README.cmake
Date Sat, 14 Sep 2013 23:30:06 GMT
Author: trawick
Date: Sat Sep 14 23:30:06 2013
New Revision: 1523355

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

Modified:
    apr/apr/trunk/CMakeLists.txt
    apr/apr/trunk/README.cmake

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1523355&r1=1523354&r2=1523355&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Sat Sep 14 23:30:06 2013
@@ -427,6 +427,17 @@ TARGET_LINK_LIBRARIES(apr-2 ${XMLLIB_LIB
 SET_TARGET_PROPERTIES(apr-2 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_HAVE_MODULAR_DSO")
 ADD_DEPENDENCIES(apr-2 test_char_header)
 
+# libaprapp-2 and aprapp-2 are static
+ADD_LIBRARY(libaprapp-2 STATIC ${APR_HEADERS} ${PROJECT_BINARY_DIR}/apr.h misc/win32/apr_app.c
misc/win32/internal.c)
+SET(install_targets ${install_targets} libaprapp-2)
+SET(install_lib_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprapp-2.pdb)
+SET_TARGET_PROPERTIES(libaprapp-2 PROPERTIES COMPILE_DEFINITIONS APR_APP)
+
+ADD_LIBRARY(aprapp-2 STATIC ${APR_HEADERS} ${PROJECT_BINARY_DIR}/apr.h misc/win32/apr_app.c)
+SET(install_targets ${install_targets} aprapp-2)
+SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-2.pdb)
+SET_TARGET_PROPERTIES(libaprapp-2 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP")
+
 IF(APU_HAVE_CRYPTO)
   IF(NOT OPENSSL_FOUND)
     MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake
build")

Modified: apr/apr/trunk/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr/trunk/README.cmake?rev=1523355&r1=1523354&r2=1523355&view=diff
==============================================================================
--- apr/apr/trunk/README.cmake (original)
+++ apr/apr/trunk/README.cmake Sat Sep 14 23:30:06 2013
@@ -120,7 +120,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-2.lib, and libaprapp-2.lib are not handled properly.
 * Options should be provided for remaining features, along with finding any
   necessary libraries
   + APR_POOL_DEBUG



Mime
View raw message