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 407d2b73fa3de19590943d025cec93ad7d352b6c (commit) via 1ab4b3e123ad6681f420244b4a944df550af6050 (commit) from 5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569 (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=407d2b73fa3de19590943d025cec93ad7d352b6c commit 407d2b73fa3de19590943d025cec93ad7d352b6c Merge: 5afdc89 1ab4b3e Author: Alexander Neundorf <neund...@kde.org> AuthorDate: Tue Mar 20 17:16:08 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Mar 20 17:16:08 2012 -0400 Merge topic 'MinorFixForEcos' into next 1ab4b3e guard eCos.cmake against multiple inclusion (#12987) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ab4b3e123ad6681f420244b4a944df550af6050 commit 1ab4b3e123ad6681f420244b4a944df550af6050 Author: Alex Neundorf <neund...@kde.org> AuthorDate: Tue Mar 20 22:13:47 2012 +0100 Commit: Alex Neundorf <neund...@kde.org> CommitDate: Tue Mar 20 22:13:47 2012 +0100 guard eCos.cmake against multiple inclusion (#12987) Alex diff --git a/Modules/Platform/eCos.cmake b/Modules/Platform/eCos.cmake index f0881c0..b437c1a 100644 --- a/Modules/Platform/eCos.cmake +++ b/Modules/Platform/eCos.cmake @@ -1,5 +1,12 @@ # support for eCos http://ecos.sourceware.org -SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") # -pic + +# Guard against multiple inclusion, which e.g. leads to multiple calls to add_definition() #12987 +IF(__ECOS_CMAKE_INCLUDED) + RETURN() +ENDIF() +SET(__ECOS_CMAKE_INCLUDED TRUE) + +SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") # -pic SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "") # -shared SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # +s, flag for exe link to use shared lib SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "") # -rpath ----------------------------------------------------------------------- Summary of changes: Modules/Platform/eCos.cmake | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits