[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2770-ga314293

[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  a3142932e35a29e040e9ced2e8fd96010ea45d09 (commit)
       via  efb19b6d45a69ff4c1fac40486a32c4bba5b8739 (commit)
      from  8793ba09d75e99ff9f7760eb3a504896fdc4a4d1 (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=a3142932e35a29e040e9ced2e8fd96010ea45d09
commit a3142932e35a29e040e9ced2e8fd96010ea45d09
Merge: 8793ba0 efb19b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 15 09:08:40 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 15 09:08:40 2013 -0400

    Merge topic 'CrossCompilingFix13796' into next
    
    efb19b6 CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efb19b6d45a69ff4c1fac40486a32c4bba5b8739
commit efb19b6d45a69ff4c1fac40486a32c4bba5b8739
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Apr 10 21:18:38 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 15 09:06:21 2013 -0400

    CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)
    
    Make the CMAKE_HOST_* variables always available in the toolchain file.
    They are when the file is included in CMakeDetermineSystem.cmake, and
    now also here.  For the non-cross-compiling case this does not change
    anything at all.
    
    Alex

diff --git a/Modules/CMakeSystem.cmake.in b/Modules/CMakeSystem.cmake.in
index 7e2a358..70c98d5 100644
--- a/Modules/CMakeSystem.cmake.in
+++ b/Modules/CMakeSystem.cmake.in
@@ -1,3 +1,8 @@
+set(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@")
+set(CMAKE_HOST_SYSTEM_NAME "@CMAKE_HOST_SYSTEM_NAME@")
+set(CMAKE_HOST_SYSTEM_VERSION "@CMAKE_HOST_SYSTEM_VERSION@")
+set(CMAKE_HOST_SYSTEM_PROCESSOR "@CMAKE_HOST_SYSTEM_PROCESSOR@")
+
 @INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED@
 
 set(CMAKE_SYSTEM "@CMAKE_SYSTEM@")
@@ -5,11 +10,6 @@ set(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
 set(CMAKE_SYSTEM_VERSION "@CMAKE_SYSTEM_VERSION@")
 set(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@")
 
-set(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@")
-set(CMAKE_HOST_SYSTEM_NAME "@CMAKE_HOST_SYSTEM_NAME@")
-set(CMAKE_HOST_SYSTEM_VERSION "@CMAKE_HOST_SYSTEM_VERSION@")
-set(CMAKE_HOST_SYSTEM_PROCESSOR "@CMAKE_HOST_SYSTEM_PROCESSOR@")
-
 set(CMAKE_CROSSCOMPILING "@CMAKE_CROSSCOMPILING@")
 
 set(CMAKE_SYSTEM_LOADED 1)

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

Summary of changes:
 Modules/CMakeSystem.cmake.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake