Diff of /config/cmake/Modules/NewCMake/FindOpenGL.cmake [60f838] .. [8d170f]  Maximize  Restore

Switch to unified view

a/config/cmake/Modules/NewCMake/FindOpenGL.cmake b/config/cmake/Modules/NewCMake/FindOpenGL.cmake
...
...
21
      /usr/X11R6/include
21
      /usr/X11R6/include
22
      ${OPENGL_INCLUDE_PATH}
22
      ${OPENGL_INCLUDE_PATH}
23
    )
23
    )
24
24
25
    FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
25
    FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
26
      /usr/lib64
26
      /usr/lib
27
      /usr/lib
27
      /usr/lib/w32api
28
      /usr/lib/w32api
28
    )
29
    )
29
30
30
    FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
31
    FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
32
      /usr/lib64
31
      /usr/lib
33
      /usr/lib
32
      /usr/lib/w32api
34
      /usr/lib/w32api
33
    )
35
    )
34
36
35
  ELSE (CYGWIN)
37
  ELSE (CYGWIN)
...
...
83
    /usr/X11R6/include
85
    /usr/X11R6/include
84
  )
86
  )
85
87
86
  FIND_LIBRARY(OPENGL_gl_LIBRARY
88
  FIND_LIBRARY(OPENGL_gl_LIBRARY
87
    NAMES MesaGL GL
89
    NAMES MesaGL GL
88
    PATHS /usr/lib
90
    PATHS /usr/lib64
91
          /usr/lib
89
          /usr/local/lib
92
          /usr/local/lib
90
          /opt/graphics/OpenGL/lib
93
          /opt/graphics/OpenGL/lib
91
          /usr/openwin/lib
94
          /usr/openwin/lib
92
          /usr/X11R6/lib
95
          /usr/X11R6/lib
93
  )
96
  )
...
...
104
  ENDIF (OPENGL_gl_LIBRARY)
107
  ENDIF (OPENGL_gl_LIBRARY)
105
108
106
  FIND_LIBRARY(OPENGL_glu_LIBRARY
109
  FIND_LIBRARY(OPENGL_glu_LIBRARY
107
    NAMES MesaGLU GLU
110
    NAMES MesaGLU GLU
108
    PATHS ${OPENGL_gl_LIBRARY}
111
    PATHS ${OPENGL_gl_LIBRARY}
112
          /usr/lib64
109
          /usr/lib
113
          /usr/lib
110
          /usr/local/lib
114
          /usr/local/lib
111
          /opt/graphics/OpenGL/lib
115
          /opt/graphics/OpenGL/lib
112
          /usr/openwin/lib
116
          /usr/openwin/lib
113
          /usr/X11R6/lib
117
          /usr/X11R6/lib