diff options
| author | Jeff Trawick <trawick@apache.org> | 2014-01-20 14:16:10 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2014-01-20 14:16:10 +0000 |
| commit | c77eb6cf1e2cd84bd6b610233b57a35595ee36dc (patch) | |
| tree | 11f1afe1ac081392b35cb2444d4c19e64dc7acef | |
| parent | f7b5ef50c1d4642e36bf906029aef62d94a12e2b (diff) | |
| download | apr-c77eb6cf1e2cd84bd6b610233b57a35595ee36dc.tar.gz | |
Windows cmake build: Fix incorrect use of some logic intended
for Windows 9x, including legacy filesystem interfaces and
dynamic loading of some Windows APIs.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1559706 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | README.cmake | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -9,7 +9,9 @@ Changes for APR 1.5.1 Trawick] *) Windows cmake build: Fix incorrect installation of some .pdb - files. [Jeff Trawick] + files. Fix incorrect use of some logic intended for Windows 9x, + including legacy filesystem interfaces and dynamic loading of + some Windows APIs. [Jeff Trawick] *) apr_skiplist: Add compatibility with C++ applications. [Jeff Trawick] diff --git a/CMakeLists.txt b/CMakeLists.txt index d59538b8e..04903f9f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -259,26 +259,26 @@ ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libap 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") +SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") ADD_DEPENDENCIES(libapr-1 test_char_header) ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) 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") +SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") ADD_DEPENDENCIES(apr-1 test_char_header) # libaprapp-1 and aprapp-1 are static ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) SET(install_targets ${install_targets} libaprapp-1) SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb) -SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS APR_APP) +SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) SET(install_targets ${install_targets} aprapp-1) SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-1.pdb) -SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP") +SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") IF(APR_BUILD_TESTAPR) ENABLE_TESTING() diff --git a/README.cmake b/README.cmake index 42c99c13c..cfff8ca0d 100644 --- a/README.cmake +++ b/README.cmake @@ -4,6 +4,8 @@ Status ------ This build support is currently intended only for Microsoft Windows. +Only Windows NT-based systems can be targeted. (The traditional +Windows build support for APR can target Windows 9x as well.) This build support is experimental. Specifically, |