You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2014/01/20 15:16:10 UTC
svn commit: r1559706 - in /apr/apr/branches/1.5.x: CHANGES CMakeLists.txt
README.cmake
Author: trawick
Date: Mon Jan 20 14:16:10 2014
New Revision: 1559706
URL: http://svn.apache.org/r1559706
Log:
Windows cmake build: Fix incorrect use of some logic intended
for Windows 9x, including legacy filesystem interfaces and
dynamic loading of some Windows APIs.
Modified:
apr/apr/branches/1.5.x/CHANGES
apr/apr/branches/1.5.x/CMakeLists.txt
apr/apr/branches/1.5.x/README.cmake
Modified: apr/apr/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?rev=1559706&r1=1559705&r2=1559706&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.5.x/CHANGES [utf-8] Mon Jan 20 14:16:10 2014
@@ -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]
Modified: apr/apr/branches/1.5.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CMakeLists.txt?rev=1559706&r1=1559705&r2=1559706&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.5.x/CMakeLists.txt Mon Jan 20 14:16:10 2014
@@ -259,26 +259,26 @@ ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCE
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()
Modified: apr/apr/branches/1.5.x/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/README.cmake?rev=1559706&r1=1559705&r2=1559706&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/README.cmake (original)
+++ apr/apr/branches/1.5.x/README.cmake Mon Jan 20 14:16:10 2014
@@ -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,