diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-01 13:14:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-01 13:14:34 (GMT) |
| commit | 357305953600b0de49f0373888c8fe5eb1e7eef4 (patch) | |
| tree | 6f11eeb1cfb5ec7af84daae41d4d45be4ad9aa62 /Modules | |
| parent | b8c5258b005f5dd677dc324164dbda1be4e403db (diff) | |
| parent | f2ff94958f22e36976854ebf97029614e4c460bf (diff) | |
| download | CMake-357305953600b0de49f0373888c8fe5eb1e7eef4.zip CMake-357305953600b0de49f0373888c8fe5eb1e7eef4.tar.gz CMake-357305953600b0de49f0373888c8fe5eb1e7eef4.tar.bz2 | |
Merge topic 'FindSDL-sound-fix'
f2ff9495 FindSDL_sound: Fix SDL_SOUND_LIBRARIES result value
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindSDL_sound.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
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") |