config_files/cmake-1.6.6.patch-old

   1 diff -Naur cmake-1.6.6-original/Modules/FindGLUT.cmake cmake-1.6.6-changed/Modules/FindGLUT.cmake
   2 --- cmake-1.6.6-original/Modules/FindGLUT.cmake 2002-12-03 21:44:50.000000000 +0300
   3 +++ cmake-1.6.6-changed/Modules/FindGLUT.cmake  2006-10-03 11:19:07.000000000 +0400
   4 @@ -20,10 +20,10 @@
   5
   6      FIND_LIBRARY( GLUT_glut_LIBRARY glut32
   7        ${OPENGL_LIBRARY_DIR}
   8 -      /usr/lib
   9 -      /usr/lib/w32api
  10 -      /usr/local/lib
  11 -      /usr/X11R6/lib
  12 +      /usr/lib64
  13 +      /usr/lib64/w32api
  14 +      /usr/local/lib64
  15 +      /usr/X11R6/lib64
  16      )
  17
  18
  19 @@ -59,28 +59,28 @@
  20        /usr/X11R6/include
  21        /usr/include/X11
  22        /opt/graphics/OpenGL/include
  23 -      /opt/graphics/OpenGL/contrib/libglut
  24 +      /opt/graphics/OpenGL/contrib/lib64glut
  25      )
  26
  27      FIND_LIBRARY( GLUT_glut_LIBRARY glut
  28 -      /usr/lib
  29 -      /usr/local/lib
  30 -      /usr/openwin/lib
  31 -      /usr/X11R6/lib
  32 +      /usr/lib64
  33 +      /usr/local/lib64
  34 +      /usr/openwin/lib64
  35 +      /usr/X11R6/lib64
  36      )
  37
  38      FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
  39 -      /usr/lib
  40 -      /usr/local/lib
  41 -      /usr/openwin/lib
  42 -      /usr/X11R6/lib
  43 +      /usr/lib64
  44 +      /usr/local/lib64
  45 +      /usr/openwin/lib64
  46 +      /usr/X11R6/lib64
  47      )
  48
  49      FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
  50 -      /usr/lib
  51 -      /usr/local/lib
  52 -      /usr/openwin/lib
  53 -      /usr/X11R6/lib
  54 +      /usr/lib64
  55 +      /usr/local/lib64
  56 +      /usr/openwin/lib64
  57 +      /usr/X11R6/lib64
  58      )
  59
  60    ENDIF (APPLE)
  61 diff -Naur cmake-1.6.6-original/Modules/FindGTK.cmake cmake-1.6.6-changed/Modules/FindGTK.cmake
  62 --- cmake-1.6.6-original/Modules/FindGTK.cmake  2003-03-17 18:00:49.000000000 +0300
  63 +++ cmake-1.6.6-changed/Modules/FindGTK.cmake   2006-10-03 11:19:43.000000000 +0400
  64 @@ -32,10 +32,10 @@
  65      /usr/local/include
  66      /usr/openwin/share/include
  67      /usr/local/include/glib12
  68 -    /usr/lib/glib/include
  69 -    /usr/local/lib/glib/include
  70 +    /usr/lib64/glib/include
  71 +    /usr/local/lib64/glib/include
  72      /opt/gnome/include
  73 -    /opt/gnome/lib/glib/include
  74 +    /opt/gnome/lib64/glib/include
  75    )
  76
  77    FIND_PATH( GTK_glib_INCLUDE_PATH glib.h
  78 @@ -44,7 +44,7 @@
  79      /usr/openwin/share/include
  80      /usr/include/gtk-1.2
  81      /usr/local/include/glib12
  82 -    /usr/lib/glib/include
  83 +    /usr/lib64/glib/include
  84      /usr/include/glib-1.2
  85      /usr/local/include/glib-1.2
  86      /opt/gnome/include
  87 @@ -59,11 +59,11 @@
  88    )
  89
  90    FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl
  91 -    /usr/lib
  92 -    /usr/local/lib
  93 -    /usr/openwin/lib
  94 -    /usr/X11R6/lib
  95 -    /opt/gnome/lib
  96 +    /usr/lib64
  97 +    /usr/local/lib64
  98 +    /usr/openwin/lib64
  99 +    /usr/X11R6/lib64
 100 +    /opt/gnome/lib64
 101    )
 102
 103    #
 104 @@ -72,38 +72,38 @@
 105
 106    FIND_LIBRARY( GTK_gtk_LIBRARY
 107      NAMES  gtk gtk12
 108 -    PATHS /usr/lib
 109 -          /usr/local/lib
 110 -          /usr/openwin/lib
 111 -          /usr/X11R6/lib
 112 -          /opt/gnome/lib
 113 +    PATHS /usr/lib64
 114 +          /usr/local/lib64
 115 +          /usr/openwin/lib64
 116 +          /usr/X11R6/lib64
 117 +          /opt/gnome/lib64
 118    )
 119
 120    FIND_LIBRARY( GTK_gdk_LIBRARY
 121      NAMES  gdk gdk12
 122 -    PATHS  /usr/lib
 123 -           /usr/local/lib
 124 -           /usr/openwin/lib
 125 -           /usr/X11R6/lib
 126 -           /opt/gnome/lib
 127 +    PATHS  /usr/lib64
 128 +           /usr/local/lib64
 129 +           /usr/openwin/lib64
 130 +           /usr/X11R6/lib64
 131 +           /opt/gnome/lib64
 132    )
 133
 134    FIND_LIBRARY( GTK_gmodule_LIBRARY
 135      NAMES  gmodule gmodule12
 136 -    PATHS  /usr/lib
 137 -           /usr/local/lib
 138 -           /usr/openwin/lib
 139 -           /usr/X11R6/lib
 140 -           /opt/gnome/lib
 141 +    PATHS  /usr/lib64
 142 +           /usr/local/lib64
 143 +           /usr/openwin/lib64
 144 +           /usr/X11R6/lib64
 145 +           /opt/gnome/lib64
 146    )
 147
 148    FIND_LIBRARY( GTK_glib_LIBRARY
 149      NAMES  glib glib12
 150 -    PATHS  /usr/lib
 151 -           /usr/local/lib
 152 -           /usr/openwin/lib
 153 -           /usr/X11R6/lib
 154 -           /opt/gnome/lib
 155 +    PATHS  /usr/lib64
 156 +           /usr/local/lib64
 157 +           /usr/openwin/lib64
 158 +           /usr/X11R6/lib64
 159 +           /opt/gnome/lib64
 160    )
 161
 162    IF(GTK_gtk_INCLUDE_PATH)
 163 diff -Naur cmake-1.6.6-original/Modules/FindOpenGL.cmake cmake-1.6.6-changed/Modules/FindOpenGL.cmake
 164 --- cmake-1.6.6-original/Modules/FindOpenGL.cmake       2003-01-15 23:32:14.000000000 +0300
 165 +++ cmake-1.6.6-changed/Modules/FindOpenGL.cmake        2006-10-03 11:19:52.000000000 +0400
 166 @@ -30,13 +30,13 @@
 167      )
 168
 169      FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
 170 -      /usr/lib
 171 -      /usr/lib/w32api
 172 +      /usr/lib64
 173 +      /usr/lib64/w32api
 174      )
 175
 176      FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
 177 -      /usr/lib
 178 -      /usr/lib/w32api
 179 +      /usr/lib64
 180 +      /usr/lib64/w32api
 181      )
 182
 183    ELSE (CYGWIN)
 184 @@ -81,11 +81,11 @@
 185
 186    FIND_LIBRARY(OPENGL_gl_LIBRARY
 187      NAMES MesaGL GL
 188 -    PATHS /usr/lib
 189 -          /usr/local/lib
 190 -          /opt/graphics/OpenGL/lib
 191 -          /usr/openwin/lib
 192 -          /usr/X11R6/lib
 193 +    PATHS /usr/lib64
 194 +          /usr/local/lib64
 195 +          /opt/graphics/OpenGL/lib64
 196 +          /usr/openwin/lib64
 197 +          /usr/X11R6/lib64
 198    )
 199
 200    # On Unix OpenGL most certainly always requires X11.
 201 @@ -102,11 +102,11 @@
 202    FIND_LIBRARY(OPENGL_glu_LIBRARY
 203      NAMES MesaGLU GLU
 204      PATHS ${OPENGL_gl_LIBRARY}
 205 -          /usr/lib
 206 -          /usr/local/lib
 207 -          /opt/graphics/OpenGL/lib
 208 -          /usr/openwin/lib
 209 -          /usr/X11R6/lib
 210 +          /usr/lib64
 211 +          /usr/local/lib64
 212 +          /opt/graphics/OpenGL/lib64
 213 +          /usr/openwin/lib64
 214 +          /usr/X11R6/lib64
 215    )
 216
 217  ENDIF (WIN32)
 218 diff -Naur cmake-1.6.6-original/Modules/FindX11.cmake cmake-1.6.6-changed/Modules/FindX11.cmake
 219 --- cmake-1.6.6-original/Modules/FindX11.cmake  2003-01-31 19:40:01.000000000 +0300
 220 +++ cmake-1.6.6-changed/Modules/FindX11.cmake   2006-10-03 11:20:06.000000000 +0400
 221 @@ -20,10 +20,10 @@
 222    )
 223
 224    SET(X11_LIB_SEARCH_PATH
 225 -    /usr/X11R6/lib
 226 -    /usr/local/lib
 227 -    /usr/openwin/lib
 228 -    /usr/lib
 229 +    /usr/X11R6/lib64
 230 +    /usr/local/lib64
 231 +    /usr/openwin/lib64
 232 +    /usr/lib64
 233    )
 234
 235    FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH})