Merge pull request #430 from jcowles/fixglfw

Fixing FindGLFW cmake module
This commit is contained in:
Takahito Tejima 2015-04-20 08:52:33 -07:00
commit e1ffd135aa

View File

@ -32,7 +32,6 @@
find_path( GLFW_INCLUDE_DIR
NAMES
GL/glfw.h
GLFW/glfw3.h
HINTS
"${GLFW_LOCATION}/include"
@ -49,6 +48,31 @@ find_path( GLFW_INCLUDE_DIR
/usr/local/include
/usr/include/GL
/usr/include
DOC
"The directory where GLFW/glfw3.h resides"
)
#
# XXX: Do we still need to search for GL/glfw.h?
#
find_path( GLFW_INCLUDE_DIR
NAMES
GL/glfw.h
HINTS
"${GLFW_LOCATION}/include"
"$ENV{GLFW_LOCATION}/include"
PATHS
"$ENV{PROGRAMFILES}/GLFW/include"
"${OPENGL_INCLUDE_DIR}"
/usr/openwin/share/include
/usr/openwin/include
/usr/X11R6/include
/usr/include/X11
/opt/graphics/OpenGL/include
/opt/graphics/OpenGL/contrib/libglfw
/usr/local/include
/usr/include/GL
/usr/include
DOC
"The directory where GL/glfw.h resides"
)