[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-964-gedca8b6

[Brad King]

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  edca8b6c81cee13aeb8bb2b14d4d3c4e79f11342 (commit)
       via  f18b18b72b8f7f8dc21e350f4dd1c6931cdb389f (commit)
      from  b40c0bb7fa48d84edf00c1468b1ae17031d9e716 (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=edca8b6c81cee13aeb8bb2b14d4d3c4e79f11342
commit edca8b6c81cee13aeb8bb2b14d4d3c4e79f11342
Merge: b40c0bb f18b18b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 8 09:53:30 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 8 09:53:30 2016 -0500

    Merge topic 'FindSDL_preventGrowingCacheVar' into next
    
    f18b18b7 FindSDL: Prevent unbounded growth of SDL_LIBRARY_TEMP variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f18b18b72b8f7f8dc21e350f4dd1c6931cdb389f
commit f18b18b72b8f7f8dc21e350f4dd1c6931cdb389f
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun Nov 6 17:37:54 2016 +1100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 8 09:52:55 2016 -0500

    FindSDL: Prevent unbounded growth of SDL_LIBRARY_TEMP variable
    
    Just modify the cache var property rather than using set() to hide it.
    Otherwise the set() includes other values added to the temporary list.
    
    Closes: #16406

diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 4e4411f..3410018 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -94,6 +94,11 @@ find_library(SDL_LIBRARY_TEMP
   PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
 )
 
+# Hide this cache variable from the user, it's an internal implementation
+# detail. The documented library variable for the user is SDL_LIBRARY
+# which is derived from SDL_LIBRARY_TEMP further below.
+set_property(CACHE SDL_LIBRARY_TEMP PROPERTY TYPE INTERNAL)
+
 if(NOT SDL_BUILDING_LIBRARY)
   if(NOT SDL_INCLUDE_DIR MATCHES ".framework")
     # Non-OS X framework versions expect you to also dynamically link to
@@ -162,8 +167,6 @@ if(SDL_LIBRARY_TEMP)
 
   # Set the final string here so the GUI reflects the final state.
   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 "")
 endif()
 
 if(SDL_INCLUDE_DIR AND EXISTS "${SDL_INCLUDE_DIR}/SDL_version.h")

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

Summary of changes:
 Modules/FindSDL.cmake |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake