Merge topic 'update-kwsys'

576ef8c5 KWSys: Tell Git not to export .gitattributes
c9709dff Merge branch 'upstream-kwsys' into update-kwsys
3b815ed2 KWSys 2015-05-12 (b1d560a0)
This commit is contained in:
Brad King 2015-05-14 10:27:44 -04:00 committed by CMake Topic Stage
commit 36c275d857
2 changed files with 9 additions and 5 deletions

View File

@ -1,8 +1,4 @@
.git* export-ignore .git* export-ignore
.gitattributes -export-ignore
/GitSetup export-ignore
/SetupForDevelopment.sh export-ignore eol=lf
/CONTRIBUTING.rst conflict-marker-size=78 /CONTRIBUTING.rst conflict-marker-size=78

View File

@ -76,7 +76,15 @@
#elif defined(__m68k__) || defined(M68000) #elif defined(__m68k__) || defined(M68000)
# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
/* MIPS */ /* MIPSel (MIPS little endian) */
#elif defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL)
# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE
/* MIPSeb (MIPS big endian) */
#elif defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB)
# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
/* MIPS (fallback, big endian) */
#elif defined(__mips) || defined(__mips__) || defined(__MIPS__) #elif defined(__mips) || defined(__mips__) || defined(__MIPS__)
# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG