[Cmake-commits] CMake branch, next, updated. v3.7.1-1830-gebb7ff5

[Rolf Eike Beer]

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  ebb7ff5b9ba490a8645de7092c729f211b8cd464 (commit)
       via  7ac84052c4f6a22349fde7b43b8b073a22bf30f1 (commit)
       via  4918cd8c98938ab245d7fea74ba6e20f3ec8ef8b (commit)
      from  b55c0379eeab76a40a0a8291d1e5ab53b0014689 (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=ebb7ff5b9ba490a8645de7092c729f211b8cd464
commit ebb7ff5b9ba490a8645de7092c729f211b8cd464
Merge: b55c037 7ac8405
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Dec 20 12:38:36 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 20 12:38:36 2016 -0500

    Merge topic 'sparc-libatomic' into next
    
    7ac84052 explicitely link against libatomic on Linux/sparc for __atomic_fetch_add_4()
    4918cd8c CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ac84052c4f6a22349fde7b43b8b073a22bf30f1
commit 7ac84052c4f6a22349fde7b43b8b073a22bf30f1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Dec 19 14:47:01 2016 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Dec 20 18:38:15 2016 +0100

    explicitely link against libatomic on Linux/sparc for __atomic_fetch_add_4()

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index d15fdbe..388bf89 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -785,6 +785,15 @@ target_link_libraries(CMakeLib cmsys
   ${CMake_KWIML_LIBRARIES}
   )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+  # the atomic instructions are implemented using libatomic on some platforms,
+  # so linking to that may be required
+  check_library_exists(atomic __atomic_fetch_add_4 "" LIBATOMIC_NEEDED)
+  if(LIBATOMIC_NEEDED)
+    target_link_libraries(CMakeLib atomic)
+  endif()
+endif()
+
 # On Apple we need CoreFoundation
 if(APPLE)
   target_link_libraries(CMakeLib "-framework CoreFoundation")

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake