[Cmake-commits] CMake branch, next, updated. v3.2.1-1230-g6450c75

[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  6450c758c809b4f597af8cac9d9c8f052931953a (commit)
       via  dcf298008f60fa00ddcb225b7a474317ad4d317f (commit)
      from  93b7164a34f40d60dbfd625d0aa90b55304ed34f (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=6450c758c809b4f597af8cac9d9c8f052931953a
commit 6450c758c809b4f597af8cac9d9c8f052931953a
Merge: 93b7164 dcf2980
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 26 09:02:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 26 09:02:25 2015 -0400

    Merge topic 'FindMFC-CMP0054' into next
    
    dcf29800 FindMFC: Use if(DEFINED) to simplify condition (#15477)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf298008f60fa00ddcb225b7a474317ad4d317f
commit dcf298008f60fa00ddcb225b7a474317ad4d317f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 26 09:00:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 26 09:02:05 2015 -0400

    FindMFC: Use if(DEFINED) to simplify condition (#15477)
    
    Replace an old hack of the form 'if("${VAR}" MATCHES "^${VAR}$")'
    with the much simpler 'if(NOT DEFINED ${VAR})'.  This was exposed
    by a CMP0054 warning.

diff --git a/Modules/FindMFC.cmake b/Modules/FindMFC.cmake
index 261ebdb..3547628 100644
--- a/Modules/FindMFC.cmake
+++ b/Modules/FindMFC.cmake
@@ -36,7 +36,7 @@ if(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW)
 endif()
 
 if(MFC_ATTEMPT_TRY_COMPILE)
-  if("MFC_HAVE_MFC" MATCHES "^MFC_HAVE_MFC$")
+  if(NOT DEFINED MFC_HAVE_MFC)
     set(CHECK_INCLUDE_FILE_VAR "afxwin.h")
     configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
       ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)

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

Summary of changes:
 Modules/FindMFC.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake