[Cmake-commits] CMake branch, next, updated. v2.8.7-2562-gcf222b1

Rolf Eike Beer eike at sf-mail.de
Sat Feb 11 11:18:46 EST 2012


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  cf222b1398ea4139ba6dd1b26dca97ddbdd39d58 (commit)
       via  ecfd43461765df599f3f5aed3022541772c4101c (commit)
      from  a846d50b95827de5f255237567cd6e81751bc0bb (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=cf222b1398ea4139ba6dd1b26dca97ddbdd39d58
commit cf222b1398ea4139ba6dd1b26dca97ddbdd39d58
Merge: a846d50 ecfd434
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Feb 11 11:18:45 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 11 11:18:45 2012 -0500

    Merge topic 'sdl-fphsa' into next
    
    ecfd434 FindSDL*: cleanup setting SDL*_FOUND


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecfd43461765df599f3f5aed3022541772c4101c
commit ecfd43461765df599f3f5aed3022541772c4101c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Feb 11 17:18:35 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Feb 11 17:18:35 2012 +0100

    FindSDL*: cleanup setting SDL*_FOUND

diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 828a3db..1c04726 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -131,7 +131,6 @@ IF(MINGW)
   SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
 ENDIF(MINGW)
 
-SET(SDL_FOUND "NO")
 IF(SDL_LIBRARY_TEMP)
   # For SDLmain
   IF(NOT SDL_BUILDING_LIBRARY)
@@ -166,8 +165,6 @@ IF(SDL_LIBRARY_TEMP)
   SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
   # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
   SET(SDL_LIBRARY_TEMP "${SDL_LIBRARY_TEMP}" CACHE INTERNAL "")
-
-  SET(SDL_FOUND "YES")
 ENDIF(SDL_LIBRARY_TEMP)
 
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 32bd57b..8edf6ca 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -114,7 +114,6 @@ FIND_LIBRARY(SDL_SOUND_LIBRARY
   /opt/lib
   )
 
-SET(SDL_SOUND_FOUND "NO")
 IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
 
   # CMake is giving me problems using TRY_COMPILE with the CMAKE_FLAGS
@@ -414,7 +413,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
    ENDIF(NOT MY_RESULT)
 
    SET(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARIES_TMP}" CACHE INTERNAL "SDL_sound and dependent libraries")
-   SET(SDL_SOUND_FOUND "YES")
  ENDIF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
 
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list