You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2014/09/16 03:33:21 UTC
svn commit: r1625199 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
CMakeLists.txt
Author: trawick
Date: Tue Sep 16 01:33:21 2014
New Revision: 1625199
URL: http://svn.apache.org/r1625199
Log:
Merge r1625196 from trunk:
Fix a cmake compatiblity issue related to quoting with cmake 2.8.12
and later.
PR: 56615
Submitted by: Chuck Liu <cliu81 gmail.com>, trawick
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/CMakeLists.txt
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1625196
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1625199&r1=1625198&r2=1625199&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Sep 16 01:33:21 2014
@@ -1,7 +1,10 @@
- -*- coding: utf-8 -*-
+ -*- coding: utf-8 -*-
Changes with Apache 2.4.11
+ *) cmake-based build for Windows: Fix incompatibility with cmake 2.8.12
+ and later. PR 56615. [Chuck Liu <cliu81 gmail.com>, Jeff Trawick]
+
*) mod_ratelimit: Drop severity of AH01455 and AH01457 (ap_pass_brigade
failed) messages from ERROR to TRACE1. Other filters do not bother
re-reporting failures from lower level filters. PR56832. [Eric Covener]
Modified: httpd/httpd/branches/2.4.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CMakeLists.txt?rev=1625199&r1=1625198&r2=1625199&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CMakeLists.txt (original)
+++ httpd/httpd/branches/2.4.x/CMakeLists.txt Tue Sep 16 01:33:21 2014
@@ -80,11 +80,11 @@ FOREACH(onelib ${APR_LIBRARIES})
ENDFOREACH()
MACRO(DEFINE_WITH_BLANKS output_definition input_symbol input_value)
- IF(MSVC_IDE)
+ IF(MSVC_IDE OR ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.11)
SET(${output_definition} "-D${input_symbol}=\"${input_value}\"")
ELSE()
- # assume command-line tool, where extra quotes must be added and escaped to
- # survive
+ # command-line tool + older cmake, where extra quotes must be added and
+ # escaped to survive
SET(${output_definition} "-D${input_symbol}=\"\\\"${input_value}\\\"\"")
ENDIF()
ENDMACRO()