FindSFML.cmake now uses the SFML_ROOT variable instead of SFMLDIR (the name is less confusing)

This commit is contained in:
Laurent Gomila 2012-04-18 18:42:49 +02:00
parent c750698333
commit 3cec4b29d6

View File

@ -28,7 +28,7 @@
# Moreover, keep in mind that SFML frameworks are only available as release libraries unlike dylibs which # Moreover, keep in mind that SFML frameworks are only available as release libraries unlike dylibs which
# are available for both release and debug modes. # are available for both release and debug modes.
# #
# If SFML is not installed in a standard path, you can use the SFMLDIR CMake (or environment) variable # If SFML is not installed in a standard path, you can use the SFML_ROOT CMake (or environment) variable
# to tell CMake where SFML is. # to tell CMake where SFML is.
# #
# Output # Output
@ -65,8 +65,8 @@ endif()
find_path(SFML_INCLUDE_DIR SFML/Config.hpp find_path(SFML_INCLUDE_DIR SFML/Config.hpp
PATH_SUFFIXES include PATH_SUFFIXES include
PATHS PATHS
${SFMLDIR} ${SFML_ROOT}
$ENV{SFMLDIR} $ENV{SFML_ROOT}
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local/ /usr/local/
@ -108,8 +108,8 @@ endif()
# find the requested modules # find the requested modules
set(SFML_FOUND TRUE) # will be set to false if one of the required modules is not found set(SFML_FOUND TRUE) # will be set to false if one of the required modules is not found
set(FIND_SFML_LIB_PATHS set(FIND_SFML_LIB_PATHS
${SFMLDIR} ${SFML_ROOT}
$ENV{SFMLDIR} $ENV{SFML_ROOT}
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local /usr/local