summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2003-01-09 20:54:29 (GMT)
committerKen Martin <ken.martin@kitware.com>2003-01-09 20:54:29 (GMT)
commit382d0d447497549b6db54b052b6eb3cc45f5d182 (patch)
tree0c0bfda2b81bab1aa8abc388d248ae64befebd78
parent75856e17627057356650be5b6547042dc8e15be6 (diff)
downloadCMake-382d0d447497549b6db54b052b6eb3cc45f5d182.zip
CMake-382d0d447497549b6db54b052b6eb3cc45f5d182.tar.gz
CMake-382d0d447497549b6db54b052b6eb3cc45f5d182.tar.bz2
better fix for win32
-rw-r--r--Modules/FindOpenGL.cmake11
1 files changed, 4 insertions, 7 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 7eb6d9004..e44cd17 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -104,8 +104,7 @@ ELSE (WIN32)
ENDIF (WIN32)
SET( OPENGL_FOUND "NO" )
-IF(OPENGL_INCLUDE_DIR)
- IF(OPENGL_gl_LIBRARY)
+IF(OPENGL_gl_LIBRARY)
IF(OPENGL_xmesa_INCLUDE_DIR)
SET( OPENGL_XMESA_FOUND "YES" )
@@ -127,13 +126,11 @@ IF(OPENGL_INCLUDE_DIR)
SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES})
- ENDIF(OPENGL_gl_LIBRARY)
+ENDIF(OPENGL_gl_LIBRARY)
- # This deprecated setting is for backward compatibility with CMake1.4
+# This deprecated setting is for backward compatibility with CMake1.4
+SET(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
- SET(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
-
-ENDIF(OPENGL_INCLUDE_DIR)
# On OSX, OpenGL is always there - this will need refining for those
# using OpenGL with X11