[Cmake-commits] CMake branch, next, updated. v3.7.1-1827-gb55c037
Rolf Eike Beer
eike at sf-mail.de
Tue Dec 20 12:38:05 EST 2016
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 b55c0379eeab76a40a0a8291d1e5ab53b0014689 (commit)
via 799e55a6a525e255c7b3c49e1afa9a62f463ca96 (commit)
from 934289dd5dce80d4f8e53b5dfdb3c300e3dbf5b2 (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=b55c0379eeab76a40a0a8291d1e5ab53b0014689
commit b55c0379eeab76a40a0a8291d1e5ab53b0014689
Merge: 934289d 799e55a
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Dec 20 12:38:04 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 20 12:38:04 2016 -0500
Merge topic 'sparc-libatomic' into next
799e55a6 FIXUP: match libatomic for all sparc
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=799e55a6a525e255c7b3c49e1afa9a62f463ca96
commit 799e55a6a525e255c7b3c49e1afa9a62f463ca96
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Dec 20 18:37:52 2016 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Dec 20 18:37:52 2016 +0100
FIXUP: match libatomic for all sparc
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 7342524..388bf89 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -785,7 +785,7 @@ target_link_libraries(CMakeLib cmsys
${CMake_KWIML_LIBRARIES}
)
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "sparc")
+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)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list