From 184b9b40716af0f8518ecdbb5e5be31671ce7a65 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 16 Sep 2014 01:33:21 +0000 Subject: [PATCH] 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 , trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1625199 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 ++++- CMakeLists.txt | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index a95ec7e666..e4d8bfc662 100644 --- a/CHANGES +++ b/CHANGES @@ -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 , 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] diff --git a/CMakeLists.txt b/CMakeLists.txt index d3d16e5a4a..71559a3d02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() -- 2.40.0