httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1625196 - /httpd/httpd/trunk/CMakeLists.txt
Date Tue, 16 Sep 2014 01:21:25 GMT
Author: trawick
Date: Tue Sep 16 01:21:24 2014
New Revision: 1625196

URL: http://svn.apache.org/r1625196
Log:
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/trunk/CMakeLists.txt

Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1625196&r1=1625195&r2=1625196&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Tue Sep 16 01:21:24 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()



Mime
View raw message