[Cmake-commits] CMake branch, next, updated. v3.0.1-4916-ga81d5ac

[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  a81d5acf82ddef37f434ffd7911fcd0d5cca1dfb (commit)
       via  4ffec8f666b996aedd592e6d26286cef2cb38b50 (commit)
      from  7420706465563b0fbfa3829d2ff69b05b284178f (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=a81d5acf82ddef37f434ffd7911fcd0d5cca1dfb
commit a81d5acf82ddef37f434ffd7911fcd0d5cca1dfb
Merge: 7420706 4ffec8f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 18 10:58:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 18 10:58:51 2014 -0400

    Merge topic 'fix-check-module-DEFINED-tests' into next
    
    4ffec8f6 Check*: Add compatibility hack for old VXL code


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ffec8f666b996aedd592e6d26286cef2cb38b50
commit 4ffec8f666b996aedd592e6d26286cef2cb38b50
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 18 10:49:30 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 18 10:59:08 2014 -0400

    Check*: Add compatibility hack for old VXL code
    
    The cleanup in commit 4f2fcce4 (Check*: Allow result variables to
    contain regex special characters, 2014-07-31) broke old VXL code that
    abuses the old "if(MATCHES)" implementation by using
    
      SET( ${VARIABLE} ${VARIABLE} )
    
    to reset a check result variable.  Add a compatibility hack to the
    CheckFunctionExists, CheckIncludeFileCXX, and CheckSymbolExists modules
    to re-run their checks when the result variable is set to its own name.
    Use STREQUAL instead of MATCHES so that special characters still work.

diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake
index 01a652b..4c4334f 100644
--- a/Modules/CheckFunctionExists.cmake
+++ b/Modules/CheckFunctionExists.cmake
@@ -38,7 +38,7 @@
 
 
 macro(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
-  if(NOT DEFINED "${VARIABLE}")
+  if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}")
     set(MACRO_CHECK_FUNCTION_DEFINITIONS
       "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}")
     if(NOT CMAKE_REQUIRED_QUIET)
diff --git a/Modules/CheckIncludeFileCXX.cmake b/Modules/CheckIncludeFileCXX.cmake
index 718e667..eff982c 100644
--- a/Modules/CheckIncludeFileCXX.cmake
+++ b/Modules/CheckIncludeFileCXX.cmake
@@ -44,7 +44,7 @@
 #  License text for the above reference.)
 
 macro(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
-  if(NOT DEFINED "${VARIABLE}")
+  if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}")
     if(CMAKE_REQUIRED_INCLUDES)
       set(CHECK_INCLUDE_FILE_CXX_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")
     else()
diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake
index 6f50c88..c31f6b6 100644
--- a/Modules/CheckSymbolExists.cmake
+++ b/Modules/CheckSymbolExists.cmake
@@ -50,7 +50,7 @@ macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
 endmacro()
 
 macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE)
-  if(NOT DEFINED "${VARIABLE}")
+  if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}")
     set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
     set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
     if(CMAKE_REQUIRED_LIBRARIES)

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

Summary of changes:
 Modules/CheckFunctionExists.cmake |    2 +-
 Modules/CheckIncludeFileCXX.cmake |    2 +-
 Modules/CheckSymbolExists.cmake   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake