[Cmake-commits] CMake branch, next, updated. v3.2.2-2059-g4d75a0b

[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  4d75a0bc1ce7b962da2d9933c07285f40212b501 (commit)
       via  22926dd6512ca817ea2d1f2f79d4f06a6c0da618 (commit)
      from  819b17ec45295da21f082efcaf311d7300f8f1e6 (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=4d75a0bc1ce7b962da2d9933c07285f40212b501
commit 4d75a0bc1ce7b962da2d9933c07285f40212b501
Merge: 819b17e 22926dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 22 16:07:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 22 16:07:24 2015 -0400

    Merge topic 'allow-empty-CMAKE_TOOLCHAIN_FILE' into next
    
    22926dd6 Allow CMAKE_TOOLCHAIN_FILE to be an empty string


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22926dd6512ca817ea2d1f2f79d4f06a6c0da618
commit 22926dd6512ca817ea2d1f2f79d4f06a6c0da618
Author:     Andrey Pokrovskiy <pokroa at amazon.com>
AuthorDate: Wed Apr 22 12:55:01 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 22 16:06:44 2015 -0400

    Allow CMAKE_TOOLCHAIN_FILE to be an empty string
    
    Do not try to include() an empty string in the generated CMakeSystem
    module.

diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index fe292ea..fa14641 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -179,7 +179,7 @@ if(CMAKE_BINARY_DIR)
   # if a toolchain file is used, it needs to be included in the configured file,
   # so settings done there are also available if they don't go in the cache and in try_compile()
   set(INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED)
-  if(DEFINED CMAKE_TOOLCHAIN_FILE)
+  if(CMAKE_TOOLCHAIN_FILE)
     set(INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED "include(\"${CMAKE_TOOLCHAIN_FILE}\")")
   endif()
 

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

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


hooks/post-receive
-- 
CMake