[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-789-g3accc28

[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  3accc2823c60bc93c779d5911bfd7d9c3fc9d091 (commit)
       via  f2ff94958f22e36976854ebf97029614e4c460bf (commit)
      from  1aaa28a5cc18cd0a8f80e7ce84ab233bc38a023f (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=3accc2823c60bc93c779d5911bfd7d9c3fc9d091
commit 3accc2823c60bc93c779d5911bfd7d9c3fc9d091
Merge: 1aaa28a f2ff949
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 28 08:20:21 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 28 08:20:21 2016 -0400

    Merge topic 'FindSDL-sound-fix' into next
    
    f2ff9495 FindSDL_sound: Fix SDL_SOUND_LIBRARIES result value


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2ff94958f22e36976854ebf97029614e4c460bf
commit f2ff94958f22e36976854ebf97029614e4c460bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 28 08:13:00 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 28 08:15:16 2016 -0400

    FindSDL_sound: Fix SDL_SOUND_LIBRARIES result value
    
    The value is meant to be a plain-variable ;-list.  Remove quotes and
    caching.
    
    Patch-by: Aleksey Chernov (virx on gitlab.kitware.com)
    Closes: #16390

diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 3198088..cf33a4c 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -19,7 +19,7 @@
 #   SDL_SOUND_INCLUDE_DIR, where to find SDL_sound.h
 #   SDL_SOUND_FOUND, if false, do not try to link to SDL_sound
 #   SDL_SOUND_LIBRARIES, this contains the list of libraries that you need
-#     to link against. This is a read-only variable and is marked INTERNAL.
+#     to link against.
 #   SDL_SOUND_EXTRAS, this is an optional variable for you to add your own
 #     flags to SDL_SOUND_LIBRARIES. This is prepended to SDL_SOUND_LIBRARIES.
 #     This is available mostly for cases this module failed to anticipate for
@@ -367,11 +367,10 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
        endif()
      endif()
 
+     set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARIES_TMP})
    else()
-     set(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY}" CACHE INTERNAL "SDL_sound and dependent libraries")
+     set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY})
    endif()
-
-   set(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARIES_TMP}" CACHE INTERNAL "SDL_sound and dependent libraries")
  endif()
 
 if(SDL_SOUND_INCLUDE_DIR AND EXISTS "${SDL_SOUND_INCLUDE_DIR}/SDL_sound.h")

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

Summary of changes:
 Modules/FindSDL_sound.cmake |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake