diff options
author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:42:58 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:18:39 (GMT) |
commit | 7bbaa4283de26864b2e55e819db0884771585467 (patch) | |
tree | ecb748dbe41a13d8bdea77acd0049cde999d933e /Modules/FindSDL_sound.cmake | |
parent | be9db98946b7918f279812fd0616abb650eebed0 (diff) | |
download | CMake-7bbaa4283de26864b2e55e819db0884771585467.zip CMake-7bbaa4283de26864b2e55e819db0884771585467.tar.gz CMake-7bbaa4283de26864b2e55e819db0884771585467.tar.bz2 |
Remove trailing whitespace from most CMake and C/C++ code
Our Git commit hooks disallow modification or addition of lines with
trailing whitespace. Wipe out all remnants of trailing whitespace
everywhere except third-party code.
Run the following shell code:
git ls-files -z -- \
bootstrap doxygen.config '*.readme' \
'*.c' '*.cmake' '*.cpp' '*.cxx' \
'*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
'*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
egrep -z -v '^(Modules/CPack\..*\.in)' |
xargs -0 sed -i 's/ \+$//'
Diffstat (limited to 'Modules/FindSDL_sound.cmake')
-rw-r--r-- | Modules/FindSDL_sound.cmake | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake index 35294a5..963a811 100644 --- a/Modules/FindSDL_sound.cmake +++ b/Modules/FindSDL_sound.cmake @@ -1,18 +1,18 @@ # Locates the SDL_sound library -# This module depends on SDL being found and +# This module depends on SDL being found and # must be called AFTER FindSDL.cmake is called. # This module defines # SDL_SOUND_INCLUDE_DIR, where to find SDL_sound.h # SDL_SOUND_FOUND, if false, do not try to link to SDL -# SDL_SOUND_LIBRARIES, this contains the list of libraries that you need +# 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. # 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 # and you must add additional flags. This is marked as ADVANCED. - + # # This module also defines (but you shouldn't need to use directly) # SDL_SOUND_LIBRARY, the name of just the SDL_sound library you would link @@ -26,32 +26,32 @@ # FLAC_LIBRARY # SPEEX_LIBRARY # -# Typically, you should not use these variables directly, and you should use -# SDL_SOUND_LIBRARIES which contains SDL_SOUND_LIBRARY and the other audio libraries -# (if needed) to successfully compile on your system . +# Typically, you should not use these variables directly, and you should use +# SDL_SOUND_LIBRARIES which contains SDL_SOUND_LIBRARY and the other audio libraries +# (if needed) to successfully compile on your system . # -# Created by Eric Wing. +# Created by Eric Wing. # This module is a bit more complicated than the other FindSDL* family modules. # The reason is that SDL_sound can be compiled in a large variety of different ways # which are independent of platform. SDL_sound may dynamically link against other 3rd # party libraries to get additional codec support, such as Ogg Vorbis, SMPEG, ModPlug, -# MikMod, FLAC, Speex, and potentially others. -# Under some circumstances which I don't fully understand, +# MikMod, FLAC, Speex, and potentially others. +# Under some circumstances which I don't fully understand, # there seems to be a requirement -# that dependent libraries of libraries you use must also be explicitly -# linked against in order to successfully compile. SDL_sound does not currently +# that dependent libraries of libraries you use must also be explicitly +# linked against in order to successfully compile. SDL_sound does not currently # have any system in place to know how it was compiled. -# So this CMake module does the hard work in trying to discover which 3rd party +# So this CMake module does the hard work in trying to discover which 3rd party # libraries are required for building (if any). # This module uses a brute force approach to create a test program that uses SDL_sound, -# and then tries to build it. If the build fails, it parses the error output for +# and then tries to build it. If the build fails, it parses the error output for # known symbol names to figure out which libraries are needed. # # Responds to the $SDLDIR and $SDLSOUNDDIR environmental variable that would # correspond to the ./configure --prefix=$SDLDIR used in building SDL. # # On OSX, this will prefer the Framework version (if found) over others. -# People will have to manually change the cache values of +# People will have to manually change the cache values of # SDL_LIBRARY to override this selectionor set the CMake environment # CMAKE_INCLUDE_PATH to modify the search paths. # @@ -91,12 +91,12 @@ FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h /opt/local/include/SDL # DarwinPorts /opt/local/include /opt/csw/include/SDL # Blastwave - /opt/csw/include + /opt/csw/include /opt/include/SDL /opt/include ) -FIND_LIBRARY(SDL_SOUND_LIBRARY +FIND_LIBRARY(SDL_SOUND_LIBRARY NAMES SDL_sound HINTS $ENV{SDLSOUNDDIR}/lib @@ -116,7 +116,7 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) # for the :STRING syntax if I have multiple values contained in a # single variable. This is a problem for the SDL_LIBRARY variable # because it does just that. When I feed this variable to the command, - # only the first value gets the appropriate modifier (e.g. -I) and + # only the first value gets the appropriate modifier (e.g. -I) and # the rest get dropped. # To get multiple single variables to work, I must separate them with a "\;" # I could go back and modify the FindSDL.cmake module, but that's kind of painful. @@ -125,12 +125,12 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) # Instead, it was suggested on the mailing list to write a temporary CMakeLists.txt # with a temporary test project and invoke that with TRY_COMPILE. # See message thread "Figuring out dependencies for a library in order to build" - # 2005-07-16 - # TRY_COMPILE( + # 2005-07-16 + # TRY_COMPILE( # MY_RESULT # ${CMAKE_BINARY_DIR} # ${PROJECT_SOURCE_DIR}/DetermineSoundLibs.c - # CMAKE_FLAGS + # CMAKE_FLAGS # -DINCLUDE_DIRECTORIES:STRING=${SDL_INCLUDE_DIR}\;${SDL_SOUND_INCLUDE_DIR} # -DLINK_LIBRARIES:STRING=${SDL_SOUND_LIBRARY}\;${SDL_LIBRARY} # OUTPUT_VARIABLE MY_OUTPUT @@ -149,25 +149,25 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) SDL_Init(0); Sound_Init(); - + /* This doesn't actually have to work, but Init() is a no-op * for some of the decoders, so this should force more symbols * to be pulled in. */ sample = Sound_NewSampleFromFile(argv[1], &desired, 4096); - + Sound_Quit(); SDL_Quit(); return 0; }" ) - # Calling + # Calling # TARGET_LINK_LIBRARIES(DetermineSoundLibs "${SDL_SOUND_LIBRARY} ${SDL_LIBRARY}) # causes problems when SDL_LIBRARY looks like # /Library/Frameworks/SDL.framework;-framework Cocoa # The ;-framework Cocoa seems to be confusing CMake once the OS X - # framework support was added. I was told that breaking up the list + # framework support was added. I was told that breaking up the list # would fix the problem. SET(TMP_TRY_LIBS) FOREACH(lib ${SDL_SOUND_LIBRARY} ${SDL_LIBRARY}) @@ -175,10 +175,10 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) ENDFOREACH(lib) # MESSAGE("TMP_TRY_LIBS ${TMP_TRY_LIBS}") - + # Write the CMakeLists.txt and test project # Weird, this is still sketchy. If I don't quote the variables - # in the TARGET_LINK_LIBRARIES, I seem to loose everything + # in the TARGET_LINK_LIBRARIES, I seem to loose everything # in the SDL_LIBRARY string after the "-framework". # But if I quote the stuff in INCLUDE_DIRECTORIES, it doesn't work. FILE(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/CMakeLists.txt @@ -188,25 +188,25 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) TARGET_LINK_LIBRARIES(DetermineSoundLibs ${TMP_TRY_LIBS})" ) - TRY_COMPILE( + TRY_COMPILE( MY_RESULT ${PROJECT_BINARY_DIR}/CMakeTmp ${PROJECT_BINARY_DIR}/CMakeTmp DetermineSoundLibs OUTPUT_VARIABLE MY_OUTPUT ) - + # MESSAGE("${MY_RESULT}") # MESSAGE(${MY_OUTPUT}) - + IF(NOT MY_RESULT) - + # I expect that MPGLIB, VOC, WAV, AIFF, and SHN are compiled in statically. # I think Timidity is also compiled in statically. # I've never had to explcitly link against Quicktime, so I'll skip that for now. - + SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARY}) - + # Find MikMod IF("${MY_OUTPUT}" MATCHES "MikMod_") FIND_LIBRARY(MIKMOD_LIBRARY @@ -222,12 +222,12 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) /opt/local/lib /opt/csw/lib /opt/lib - ) + ) IF(MIKMOD_LIBRARY) SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MIKMOD_LIBRARY}) ENDIF(MIKMOD_LIBRARY) ENDIF("${MY_OUTPUT}" MATCHES "MikMod_") - + # Find ModPlug IF("${MY_OUTPUT}" MATCHES "MODPLUG_") FIND_LIBRARY(MODPLUG_LIBRARY @@ -249,7 +249,7 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) ENDIF(MODPLUG_LIBRARY) ENDIF("${MY_OUTPUT}" MATCHES "MODPLUG_") - + # Find Ogg and Vorbis IF("${MY_OUTPUT}" MATCHES "ov_") FIND_LIBRARY(VORBIS_LIBRARY @@ -271,7 +271,7 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) IF(VORBIS_LIBRARY) SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY}) ENDIF(VORBIS_LIBRARY) - + FIND_LIBRARY(OGG_LIBRARY NAMES ogg Ogg OGG PATHS @@ -292,8 +292,8 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY}) ENDIF(OGG_LIBRARY) ENDIF("${MY_OUTPUT}" MATCHES "ov_") - - + + # Find SMPEG IF("${MY_OUTPUT}" MATCHES "SMPEG_") FIND_LIBRARY(SMPEG_LIBRARY @@ -314,8 +314,8 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SMPEG_LIBRARY}) ENDIF(SMPEG_LIBRARY) ENDIF("${MY_OUTPUT}" MATCHES "SMPEG_") - - + + # Find FLAC IF("${MY_OUTPUT}" MATCHES "FLAC_") FIND_LIBRARY(FLAC_LIBRARY @@ -336,8 +336,8 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${FLAC_LIBRARY}) ENDIF(FLAC_LIBRARY) ENDIF("${MY_OUTPUT}" MATCHES "FLAC_") - - + + # Hmmm...Speex seems to depend on Ogg. This might be a problem if # the TRY_COMPILE attempt gets blocked at SPEEX before it can pull # in the Ogg symbols. I'm not sure if I should duplicate the ogg stuff @@ -360,7 +360,7 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) IF(SPEEX_LIBRARY) SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY}) ENDIF(SPEEX_LIBRARY) - + # Find OGG (needed for Speex) # We might have already found Ogg for Vorbis, so skip it if so. IF(NOT OGG_LIBRARY) @@ -387,7 +387,7 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) ENDIF(OGG_LIBRARY) ENDIF(NOT OGG_LIBRARY) ENDIF("${MY_OUTPUT}" MATCHES "speex_") - + ELSE(NOT MY_RESULT) SET(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY}" CACHE INTERNAL "SDL_sound and dependent libraries") ENDIF(NOT MY_RESULT) |