[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2682-gd684188

[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  d6841889d49e0f305409dfffa7cc938949e05556 (commit)
       via  480e924daedee520d18c8a9c0b9823fef205b57a (commit)
       via  9f160c5b0a7e0f821ca4737638edbebf0ed398be (commit)
      from  4ab0bfa94699e27114412708501833a6e40eed21 (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=d6841889d49e0f305409dfffa7cc938949e05556
commit d6841889d49e0f305409dfffa7cc938949e05556
Merge: 4ab0bfa 480e924
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 21 08:30:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 21 08:30:52 2013 -0400

    Merge topic 'openbsd-elf-parsing' into next
    
    480e924 OpenBSD: Enable ELF parsing and editing (#14241)
    9f160c5 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=480e924daedee520d18c8a9c0b9823fef205b57a
commit 480e924daedee520d18c8a9c0b9823fef205b57a
Author:     David Coppa <dcoppa at openbsd.org>
AuthorDate: Fri Jun 21 11:13:35 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 21 08:27:40 2013 -0400

    OpenBSD: Enable ELF parsing and editing (#14241)
    
    OpenBSD provides ELF ABI declarations in
    
     #include <stdint.h>
     #include <elf_abi.h>
    
    Teach the platform check and cmELF implementation to use these.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1893167..67a6333 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -11,7 +11,11 @@
 #=============================================================================
 include(CheckIncludeFile)
 # Check if we can build support for ELF parsing.
-CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H)
+if(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
+  CHECK_INCLUDE_FILES("stdint.h;elf_abi.h" HAVE_ELF_H)
+else()
+  CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H)
+endif()
 if(HAVE_ELF_H)
   set(CMAKE_USE_ELF_PARSER 1)
 else()
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 1158fc0..30de9a8 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -19,7 +19,12 @@
 #include <cmsys/CPU.h>
 
 // Include the ELF format information system header.
-#include <elf.h>
+#if defined(__OpenBSD__)
+# include <stdint.h>
+# include <elf_abi.h>
+#else
+# include <elf.h>
+#endif
 #if defined(__sun)
 # include <sys/link.h> // For dynamic section information
 #endif

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

Summary of changes:
 Source/CMakeLists.txt     |    6 +++++-
 Source/CMakeVersion.cmake |    2 +-
 Source/cmELF.cxx          |    7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake