[Cmake-commits] CMake branch, next, updated. v3.4.1-1660-g11039e0

[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  11039e0002bd03eccaee930d308b1afd5dcf3a9b (commit)
       via  d462ac27d814e966c54bb638444e4b125d1d665f (commit)
      from  3b6d20b90ba55652b3bd3f75ceed4bc6a45286c4 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11039e0002bd03eccaee930d308b1afd5dcf3a9b
commit 11039e0002bd03eccaee930d308b1afd5dcf3a9b
Merge: 3b6d20b d462ac2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 9 11:40:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 9 11:40:35 2015 -0500

    Merge topic 'cmELF-use-KWIML' into next
    
    d462ac27 cmELF: Use KWIML ABI.h header to get endian-ness


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d462ac27d814e966c54bb638444e4b125d1d665f
commit d462ac27d814e966c54bb638444e4b125d1d665f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 9 11:38:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 9 11:38:10 2015 -0500

    cmELF: Use KWIML ABI.h header to get endian-ness
    
    Port away from KWSys CPU header.

diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 37dd328..fda6e02 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -16,8 +16,7 @@
 #include <cmsys/FStream.hxx>
 
 // Need the native byte order of the running CPU.
-#define cmsys_CPU_UNKNOWN_OKAY // We can decide at runtime if not known.
-#include <cmsys/CPU.h>
+#include <cmIML/ABI.h>
 
 // Include the ELF format information system header.
 #if defined(__OpenBSD__)
@@ -102,9 +101,9 @@ public:
     // In most cases the processor-specific byte order will match that
     // of the target execution environment.  If we choose wrong here
     // it is fixed when the header is read.
-#if cmsys_CPU_ENDIAN_ID == cmsys_CPU_ENDIAN_ID_LITTLE
+#if cmIML_ABI_ENDIAN_ID == cmIML_ABI_ENDIAN_ID_LITTLE
     this->NeedSwap = (this->ByteOrder == ByteOrderMSB);
-#elif cmsys_CPU_ENDIAN_ID == cmsys_CPU_ENDIAN_ID_BIG
+#elif cmIML_ABI_ENDIAN_ID == cmIML_ABI_ENDIAN_ID_BIG
     this->NeedSwap = (this->ByteOrder == ByteOrderLSB);
 #else
     this->NeedSwap = false; // Final decision is at runtime anyway.

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

Summary of changes:
 Source/cmELF.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake