[cmake-commits] alex committed FindOpenGL.cmake 1.39 1.40

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv20003

Modified Files:
	FindOpenGL.cmake 
Log Message:

STYLE: remove unnecessary default search paths

Alex


Index: FindOpenGL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenGL.cmake,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- FindOpenGL.cmake	3 Jul 2007 15:41:37 -0000	1.39
+++ FindOpenGL.cmake	10 Aug 2007 15:37:29 -0000	1.40
@@ -18,21 +18,11 @@
 IF (WIN32)
   IF (CYGWIN)
 
-    FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h
-      /usr/include
-      /usr/include/w32api
-      /usr/X11R6/include
-    )
+    FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h )
 
-    FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
-      /usr/lib
-      /usr/lib/w32api
-    )
+    FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32 )
 
-    FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
-      /usr/lib
-      /usr/lib/w32api
-    )
+    FIND_LIBRARY(OPENGL_glu_LIBRARY glu32 )
 
   ELSE (CYGWIN)
 
@@ -66,29 +56,20 @@
 
     FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h
       /usr/share/doc/NVIDIA_GLX-1.0/include
-      /usr/include
-      /usr/local/include
       /usr/openwin/share/include
       /opt/graphics/OpenGL/include
-      /usr/X11R6/include
     )
 
     FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
       /usr/share/doc/NVIDIA_GLX-1.0/include
-      /usr/include
-      /usr/local/include
       /usr/openwin/share/include
       /opt/graphics/OpenGL/include
-      /usr/X11R6/include
     )
 
     FIND_LIBRARY(OPENGL_gl_LIBRARY
       NAMES GL MesaGL
-      PATHS /usr/lib
-            /usr/local/lib
-            /opt/graphics/OpenGL/lib
+      PATHS /opt/graphics/OpenGL/lib
             /usr/openwin/lib
-            /usr/X11R6/lib
             /usr/shlib
     )
 
@@ -111,11 +92,8 @@
     FIND_LIBRARY(OPENGL_glu_LIBRARY
       NAMES GLU MesaGLU
       PATHS ${OPENGL_gl_LIBRARY}
-            /usr/lib
-            /usr/local/lib
             /opt/graphics/OpenGL/lib
             /usr/openwin/lib
-            /usr/X11R6/lib
             /usr/shlib
     )