[Cmake-commits] CMake branch, next, updated. v3.2.2-2588-g67d888e

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  67d888ec916cff125030f00c5770a2cc547ec7cb (commit)
       via  65e6b1152fad1b8282761abdfcc389ea4fd4747e (commit)
       via  3bc6f4f4762ba32d77b229e3385a8084015369b2 (commit)
      from  ffd4c588ef0e205f665f19e1bc9ad241cc757061 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67d888ec916cff125030f00c5770a2cc547ec7cb
commit 67d888ec916cff125030f00c5770a2cc547ec7cb
Merge: ffd4c58 65e6b11
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 7 09:08:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 7 09:08:08 2015 -0400

    Merge topic 'WCDH-CMP0054-safety' into next
    
    65e6b115 WCDH: Fix condition when variables named "FILE" or "PREFIX" are defined
    3bc6f4f4 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65e6b1152fad1b8282761abdfcc389ea4fd4747e
commit 65e6b1152fad1b8282761abdfcc389ea4fd4747e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 7 09:00:45 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 7 09:00:45 2015 -0400

    WCDH: Fix condition when variables named "FILE" or "PREFIX" are defined
    
    Reported-by: Kevin Godby <godbyk at gmail.com>

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index f4dcb21..a3b73bb 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -246,10 +246,10 @@ function(write_compiler_detection_header
     file_keyword file_arg
     prefix_keyword prefix_arg
     )
-  if (NOT file_keyword STREQUAL FILE)
+  if (NOT "x${file_keyword}" STREQUAL "xFILE")
     message(FATAL_ERROR "write_compiler_detection_header: FILE parameter missing.")
   endif()
-  if (NOT prefix_keyword STREQUAL PREFIX)
+  if (NOT "x${prefix_keyword}" STREQUAL "xPREFIX")
     message(FATAL_ERROR "write_compiler_detection_header: PREFIX parameter missing.")
   endif()
   set(options)

-----------------------------------------------------------------------

Summary of changes:
 Modules/WriteCompilerDetectionHeader.cmake |    4 ++--
 Source/CMakeVersion.cmake                  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake