diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-14 21:16:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-14 21:16:57 (GMT) |
| commit | 16447fa92faf4ef29c4b86ba8b41d62105986a9b (patch) | |
| tree | 5be8b30307899ad303aab9c0623352505a7fd290 /Modules/FindSDL.cmake | |
| parent | 0402697c06368b81ad344885e95cc90ecb28b44b (diff) | |
| parent | a6de8a58822a70182e58ead76a1b308e11350bff (diff) | |
| download | CMake-16447fa92faf4ef29c4b86ba8b41d62105986a9b.zip CMake-16447fa92faf4ef29c4b86ba8b41d62105986a9b.tar.gz CMake-16447fa92faf4ef29c4b86ba8b41d62105986a9b.tar.bz2 | |
Merge topic 'sdl-fphsa'
a6de8a5 FindSDL*: use FPHSA (#12467)
Diffstat (limited to 'Modules/FindSDL.cmake')
| -rw-r--r-- | Modules/FindSDL.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index 0dc02f5..1c04726 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -81,7 +81,6 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h /opt/csw # Blastwave /opt ) -#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") # SDL-1.1 is the name used by FreeBSD ports... # don't confuse it for the version number. @@ -97,8 +96,6 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP /opt ) -#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}") - IF(NOT SDL_BUILDING_LIBRARY) IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") # Non-OS X framework versions expect you to also dynamically link to @@ -134,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) @@ -169,9 +165,9 @@ 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) -#MESSAGE("SDL_LIBRARY is ${SDL_LIBRARY}") +INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL + REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR) |