diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-09-15 00:32:18 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-09-15 00:32:18 +0000 |
| commit | e2be226f60f15a3d92fbca8185bb3952d404f22f (patch) | |
| tree | f9c8ad0848ba207bffcd7d74cfb3846c0f298df1 | |
| parent | 28c9c8041a57466b16ddbb863519550159eab219 (diff) | |
| download | libapr-e2be226f60f15a3d92fbca8185bb3952d404f22f.tar.gz | |
backport of r1523355: build aprapp-2.lib and libaprapp-1.lib
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1523373 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | README.cmake | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c13cf6df7..6b5842dd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,6 +252,17 @@ 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") +# 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) diff --git a/README.cmake b/README.cmake index 4ce88d6cc..13ae18773 100644 --- a/README.cmake +++ b/README.cmake @@ -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. |