diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-10-28 21:46:44 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-10-28 21:46:44 (GMT) |
| commit | 18d9adde9649fee733ceb6f464fbc6f2b71daa6c (patch) | |
| tree | 5562f7330775a6252d367a70d6d66a3f59a92759 /Modules/FindSDL_net.cmake | |
| parent | c78df4615355431db6b50c750258f3a5975b9321 (diff) | |
| download | CMake-18d9adde9649fee733ceb6f464fbc6f2b71daa6c.zip CMake-18d9adde9649fee733ceb6f464fbc6f2b71daa6c.tar.gz CMake-18d9adde9649fee733ceb6f464fbc6f2b71daa6c.tar.bz2 | |
ENH: changes from Eric Wing, bug 2249
Diffstat (limited to 'Modules/FindSDL_net.cmake')
| -rw-r--r-- | Modules/FindSDL_net.cmake | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake index dce301f..b643f9a 100644 --- a/Modules/FindSDL_net.cmake +++ b/Modules/FindSDL_net.cmake @@ -16,35 +16,62 @@ # People will have to manually change the cache values of # SDLNET_LIBRARY to override this selection. FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h + $ENV{SDLNETDIR}/include + $ENV{SDLDIR}/include ~/Library/Frameworks/SDL_net.framework/Headers /Library/Frameworks/SDL_net.framework/Headers - $ENV{SDLDIR}/include - $ENV{SDLNETDIR}/include + /usr/local/include/SDL /usr/include/SDL + /usr/local/include/SDL12 + /usr/local/include/SDL11 # FreeBSD ports /usr/include/SDL12 /usr/include/SDL11 - /usr/include - /usr/local/include/SDL - /usr/local/include/SDL12 - /usr/local/include/SDL11 /usr/local/include + /usr/include + /sw/include/SDL # Fink /sw/include + /opt/local/include/SDL # DarwinPorts + /opt/local/include + /opt/csw/include/SDL # Blastwave + /opt/csw/include + /opt/include/SDL + /opt/include ) # I'm not sure if I should do a special casing for Apple. It is # unlikely that other Unix systems will find the framework path. # But if they do ([Next|Open|GNU]Step?), # do they want the -framework option also? IF(${SDLNET_INCLUDE_DIR} MATCHES ".framework") - SET (SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX") + # Extract the path the framework resides in so we can use it for the -F flag + STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLNET_FRAMEWORK_PATH_TEMP ${SDLNET_INCLUDE_DIR}) + IF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks" + OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks" + ) + # String is in default search path, don't need to use -F + SET(SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX") + ELSE("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks" + OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks" + ) + # String is not /Library/Frameworks, need to use -F + SET(SDLNET_LIBRARY "-F${SDLNET_FRAMEWORK_PATH_TEMP} -framework SDL_net" CACHE STRING "SDL_net framework for OSX") + ENDIF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks" + OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks" + ) + # Clear the temp variable so nobody can see it + SET(SDLNET_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "") + ELSE(${SDLNET_INCLUDE_DIR} MATCHES ".framework") FIND_LIBRARY(SDLNET_LIBRARY NAMES SDL_net PATHS - $ENV{SDLDIR}/lib $ENV{SDLNET}/lib - /usr/lib + $ENV{SDLDIR}/lib /usr/local/lib + /usr/lib /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib ) ENDIF(${SDLNET_INCLUDE_DIR} MATCHES ".framework") |