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/FindPhysFS.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/FindPhysFS.cmake')
| -rw-r--r-- | Modules/FindPhysFS.cmake | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake index d57d474..dda6577 100644 --- a/Modules/FindPhysFS.cmake +++ b/Modules/FindPhysFS.cmake @@ -15,29 +15,55 @@ # People will have to manually change the cache values of # PHYSFS_LIBRARY to override this selection. FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h + $ENV{PHYSFSDIR}/include ~/Library/Frameworks/PhysFS.framework/Headers /Library/Frameworks/PhysFS.framework/Headers - $ENV{PHYSFSDIR}/include - /usr/include - /usr/include/physfs /usr/local/include/physfs + /usr/local/include + /usr/include/physfs + /usr/include + /sw/include/physfs # Fink /sw/include - /sw/include/physfs + /opt/local/include/physfs # DarwinPorts + /opt/local/include + /opt/csw/include/physfs # Blastwave + /opt/csw/include + /opt/include/physfs + /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(${PHYSFS_INCLUDE_DIR} MATCHES ".framework") - SET (PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX") + STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" PHYSFS_FRAMEWORK_PATH_TMP ${PHYSFS_INCLUDE_DIR}) + IF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks" + OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks" + ) + # String is in default search path, don't need to use -F + SET(PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX") + ELSE("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks" + OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks" + ) + # String is not /Library/Frameworks, need to use -F + SET(PHYSFS_LIBRARY "-F${PHYSFS_FRAMEWORK_PATH_TMP} -framework PhysFS" CACHE STRING "PhysFS framework for OSX") + ENDIF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks" + OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks" + ) + # Clear the temp variable so nobody can see it + SET(PHYSFS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "") + ELSE(${PHYSFS_INCLUDE_DIR} MATCHES ".framework") FIND_LIBRARY(PHYSFS_LIBRARY NAMES physfs PhysFS PATHS $ENV{PHYSFSDIR}/lib - /usr/lib /usr/local/lib + /usr/lib /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib ) ENDIF(${PHYSFS_INCLUDE_DIR} MATCHES ".framework") |