[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-605-g5633c9d

[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  5633c9d898682b5a92e5411c205f6a7f888b9e42 (commit)
       via  15f55cca5971c93b1b6c950b9b7ca5a398140957 (commit)
      from  fa94cb2ec039960e57f9bdb49827571fc637a8a7 (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=5633c9d898682b5a92e5411c205f6a7f888b9e42
commit 5633c9d898682b5a92e5411c205f6a7f888b9e42
Merge: fa94cb2 15f55cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 13 08:59:09 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 13 08:59:09 2014 -0500

    Merge topic 'no-cmake-self-install-when-cross-compiling' into next
    
    15f55cca Do not use just-built CMake to install itself when cross-compiling (#15248)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15f55cca5971c93b1b6c950b9b7ca5a398140957
commit 15f55cca5971c93b1b6c950b9b7ca5a398140957
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 13 08:53:51 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 13 08:58:16 2014 -0500

    Do not use just-built CMake to install itself when cross-compiling (#15248)
    
    The special case added by commit v2.4.0~3051 (When building CMake
    itself, use the new cmake to install so that the current cmake can be
    overwritten, 2004-06-09) does not make sense when cross-compiling.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6a4adc0..978f00e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2362,7 +2362,8 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
         depends.push_back(this->GetAllTargetName());
         }
       }
-    if(mf->GetDefinition("CMake_BINARY_DIR"))
+    if(mf->GetDefinition("CMake_BINARY_DIR") &&
+       !mf->IsOn("CMAKE_CROSSCOMPILING"))
       {
       // We are building CMake itself.  We cannot use the original
       // executable to install over itself.  The generator will

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake