[Cmake-commits] CMake branch, next, updated. v2.8.9-571-gfed487b

[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  fed487bc2081748c3cc15352604b34c1c2e17e58 (commit)
       via  adf705863c0ccfe0b688aa615c306836caa9687f (commit)
      from  396e5c90604db53751e6618790e1e1036ec6414e (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=fed487bc2081748c3cc15352604b34c1c2e17e58
commit fed487bc2081748c3cc15352604b34c1c2e17e58
Merge: 396e5c9 adf7058
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Sep 17 14:30:25 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 17 14:30:25 2012 -0400

    Merge topic 'findsdl-unlimited-main-13262' into next
    
    adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adf705863c0ccfe0b688aa615c306836caa9687f
commit adf705863c0ccfe0b688aa615c306836caa9687f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 9 16:08:45 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Sep 17 20:29:29 2012 +0200

    FindSDL: add SDLMAIN_LIBRARY only once (#13262)

diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 487c5d3..adaec95 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -133,10 +133,12 @@ endif()
 
 if(SDL_LIBRARY_TEMP)
   # For SDLmain
-  if(NOT SDL_BUILDING_LIBRARY)
-    if(SDLMAIN_LIBRARY)
-      set(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+  if(SDLMAIN_LIBRARY AND NOT SDL_BUILDING_LIBRARY)
+    list(FIND SDL_LIBRARY_TEMP "${SDLMAIN_LIBRARY}" _SDL_MAIN_INDEX)
+    if(_SDL_MAIN_INDEX EQUAL -1)
+      list(APPEND SDL_LIBRARY_TEMP "${SDLMAIN_LIBRARY}")
     endif()
+    unset(_SDL_MAIN_INDEX)
   endif()
 
   # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.

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

Summary of changes:
 Modules/FindSDL.cmake |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake