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 934289dd5dce80d4f8e53b5dfdb3c300e3dbf5b2 (commit)
via f3b3644c4fed7915bb6774929af5766ed1809054 (commit)
via 3657ac9fbb6bf6cd82bf9a0119fd989ab3f4f704 (commit)
via 77468c751f62c4dfa64fb60c5f4336a8534aec85 (commit)
from 0fdba25baabb8f32141a6ebc854ad8cd9f4a646c (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=934289dd5dce80d4f8e53b5dfdb3c300e3dbf5b2
commit 934289dd5dce80d4f8e53b5dfdb3c300e3dbf5b2
Merge: 0fdba25 f3b3644
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Dec 19 08:47:33 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 19 08:47:33 2016 -0500
Merge topic 'sparc-libatomic' into next
f3b3644c explicitely link against libatomic on Linux/sparc for
__atomic_fetch_add_4()
3657ac9f CMake Nightly Date Stamp
77468c75 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3b3644c4fed7915bb6774929af5766ed1809054
commit f3b3644c4fed7915bb6774929af5766ed1809054
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Dec 19 14:47:01 2016 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Mon Dec 19 14:47:01 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..7342524 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 STREQUAL
"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/CMakeLists.txt | 9 +++++++++
Source/CMakeVersion.cmake | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
