[Cmake-commits] CMake branch, master, updated. 981c7f5a5bcd4bf3c704dd28d21bfce73c69112e

[cmake-commits at cmake.org]

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, master has been updated
       via  981c7f5a5bcd4bf3c704dd28d21bfce73c69112e (commit)
       via  f99771ce0a42f91f825c941cc8f0cbc4514875a7 (commit)
       via  8d907e298bb76078e6851b520bc0afa18eb8ee3f (commit)
      from  fcdbe001ea87462997b96024ee8c166884257883 (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=981c7f5a5bcd4bf3c704dd28d21bfce73c69112e
commit 981c7f5a5bcd4bf3c704dd28d21bfce73c69112e
Author: Alex Neundorf <neundorf at kde.org>
Date:   Sun Apr 11 00:12:45 2010 +0200

    -check for the ARM ABI/EABI compiler ABI for the GNU compilers
    
    The names are:
    EABI: "ELF ARMEABI"
    non-EABI: "ELF ARM"
    
    Alex

diff --git a/Modules/CMakeCompilerABI.h b/Modules/CMakeCompilerABI.h
index 8980abb..26ae4db 100644
--- a/Modules/CMakeCompilerABI.h
+++ b/Modules/CMakeCompilerABI.h
@@ -17,6 +17,16 @@ const char info_sizeof_dptr[] =  {
 # define ABI_ID "ELF N32"
 #elif defined(__sgi) && defined(_ABI64)
 # define ABI_ID "ELF 64"
+
+/* Check for (some) ARM ABIs.
+ * See e.g. http://wiki.debian.org/ArmEabiPort for some information on this. */
+#elif defined(__GNU__) && defined(__ELF__) && defined(__ARM_EABI__)
+# define ABI_ID "ELF ARMEABI"
+#elif defined(__GNU__) && defined(__ELF__) && defined(__ARMEB__)
+# define ABI_ID "ELF ARM"
+#elif defined(__GNU__) && defined(__ELF__) && defined(__ARMEL__)
+# define ABI_ID "ELF ARM"
+
 #elif defined(__ELF__)
 # define ABI_ID "ELF"
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f99771ce0a42f91f825c941cc8f0cbc4514875a7
commit f99771ce0a42f91f825c941cc8f0cbc4514875a7
Author: Alex Neundorf <neundorf at kde.org>
Date:   Sat Apr 10 23:48:43 2010 +0200

    -revert the previous unintended commit
    
    Alex

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 5f5dec0..0302d5c 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -713,8 +713,6 @@ function(_ep_add_download_command name)
       _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${file}" "${tmp_dir}" "${source_dir}")
       list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
     endif()
-  elseif(source_dir AND EXISTS "${source_dir}")
-    set(cmd echo Sources present at ${source_dir})
   else()
     message(SEND_ERROR "error: no download info for '${name}' -- please specify existing SOURCE_DIR or one of URL, CVS_REPOSITORY and CVS_MODULE, SVN_REPOSITORY or DOWNLOAD_COMMAND")
   endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d907e298bb76078e6851b520bc0afa18eb8ee3f
commit 8d907e298bb76078e6851b520bc0afa18eb8ee3f
Author: Alex Neundorf <neundorf at kde.org>
Date:   Sat Apr 10 23:46:47 2010 +0200

    -no change, don't know why git wants to commit something
    
    (I accidentially removed ExternalProject.cmake from git by doing
    mv ExternalProject.cmake ExternalProject.cmake.save
    git checkout master
    which I hoped would basically do a revert as it does with svn and cvs, but it
    deleted the file from git)
    
    Alex

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0302d5c..5f5dec0 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -713,6 +713,8 @@ function(_ep_add_download_command name)
       _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${file}" "${tmp_dir}" "${source_dir}")
       list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
     endif()
+  elseif(source_dir AND EXISTS "${source_dir}")
+    set(cmd echo Sources present at ${source_dir})
   else()
     message(SEND_ERROR "error: no download info for '${name}' -- please specify existing SOURCE_DIR or one of URL, CVS_REPOSITORY and CVS_MODULE, SVN_REPOSITORY or DOWNLOAD_COMMAND")
   endif()

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

Summary of changes:
 Modules/CMakeCompilerABI.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake