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 49d59fdc2a95d6606bef7df9a06db8b397e23e0a (commit)
via 981629f701c598f58115445456ee733077beae8d (commit)
from 4db7a28b21b1288d69ca7d141160773868723a76 (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=49d59fdc2a95d6606bef7df9a06db8b397e23e0a
commit 49d59fdc2a95d6606bef7df9a06db8b397e23e0a
Merge: 4db7a28 981629f
Author: Benjamin Eikel <[email protected]>
AuthorDate: Mon Dec 3 15:59:12 2012 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Dec 3 15:59:12 2012 -0500
Merge topic 'ChangeSDLLinkLibraryOrder' into next
981629f Swap linking order of SDLmain and SDL (#0013769)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=981629f701c598f58115445456ee733077beae8d
commit 981629f701c598f58115445456ee733077beae8d
Author: Benjamin Eikel <[email protected]>
AuthorDate: Sun Dec 2 14:32:47 2012 +0100
Commit: Benjamin Eikel <[email protected]>
CommitDate: Sun Dec 2 14:32:47 2012 +0100
Swap linking order of SDLmain and SDL (#0013769)
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index f2e9f25..fec142e 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -122,7 +122,7 @@ if(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}")
+ set(SDL_LIBRARY_TEMP "${SDLMAIN_LIBRARY}" ${SDL_LIBRARY_TEMP})
endif()
unset(_SDL_MAIN_INDEX)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindSDL.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
