1 diff -ru cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake 2 --- cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake Wed Sep 24 11:34:34 2008 3 +++ cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake Thu May 21 16:21:06 2009 4 @@ -41,8 +41,9 @@ 5 /usr/bin 6 /usr/lib/java/bin 7 /usr/share/java/bin 8 - /usr/local/bin 9 - /usr/local/java/bin 10 +# Uncomment the following to enable /usr/local search 11 +# /usr/local/bin 12 +# /usr/local/java/bin 13 /usr/java/j2sdk1.4.2_04 14 /usr/lib/j2sdk1.4-sun/bin 15 /usr/lib/j2sdk1.5-sun/bin 16 diff -ru cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake cmake-2.6.2/Modules/CMakeDetermineSystem.cmake 17 --- cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake Wed Sep 24 11:34:34 2008 18 +++ cmake-2.6.2/Modules/CMakeDetermineSystem.cmake Thu May 21 16:21:06 2009 19 @@ -29,7 +29,9 @@ 20 21 # find out on which system cmake runs 22 IF(CMAKE_HOST_UNIX) 23 - FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) 24 + FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin ) 25 +# Uncomment the following to enable /usr/local search 26 +# FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) 27 IF(CMAKE_UNAME) 28 EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) 29 EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) 30 diff -ru cmake-2.6.2.org//Modules/FindAVIFile.cmake cmake-2.6.2/Modules/FindAVIFile.cmake 31 --- cmake-2.6.2.org//Modules/FindAVIFile.cmake Wed Sep 24 11:34:34 2008 32 +++ cmake-2.6.2/Modules/FindAVIFile.cmake Thu May 21 16:21:06 2009 33 @@ -12,14 +12,16 @@ 34 IF (UNIX) 35 36 FIND_PATH(AVIFILE_INCLUDE_DIR avifile.h 37 - /usr/local/avifile/include 38 - /usr/local/include/avifile 39 +# Uncomment the following to enable /usr/local search 40 +# /usr/local/avifile/include 41 +# /usr/local/include/avifile 42 /usr/include 43 ) 44 45 FIND_LIBRARY(AVIFILE_AVIPLAY_LIBRARY aviplay 46 - /usr/local/avifile/lib 47 - /usr/local/lib 48 +# Uncomment the following to enable /usr/local search 49 +# /usr/local/avifile/lib 50 +# /usr/local/lib 51 /usr/lib 52 ) 53 54 diff -ru cmake-2.6.2.org//Modules/FindBLAS.cmake cmake-2.6.2/Modules/FindBLAS.cmake 55 --- cmake-2.6.2.org//Modules/FindBLAS.cmake Wed Sep 24 11:34:34 2008 56 +++ cmake-2.6.2/Modules/FindBLAS.cmake Thu May 21 16:21:06 2009 57 @@ -72,7 +72,9 @@ 58 endif(BLA_STATIC) 59 find_library(${_prefix}_${_library}_LIBRARY 60 NAMES ${_library} 61 - PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH 62 + PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV DYLD_LIBRARY_PATH 63 +# Uncomment the following to enable /usr/local search 64 +# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH 65 ) 66 67 else ( APPLE ) 68 @@ -81,7 +83,9 @@ 69 endif(BLA_STATIC) 70 find_library(${_prefix}_${_library}_LIBRARY 71 NAMES ${_library} 72 - PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH 73 + PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH 74 +# Uncomment the following to enable /usr/local search 75 +# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH 76 ) 77 endif( APPLE ) 78 mark_as_advanced(${_prefix}_${_library}_LIBRARY) 79 diff -ru cmake-2.6.2.org//Modules/FindFLTK.cmake cmake-2.6.2/Modules/FindFLTK.cmake 80 --- cmake-2.6.2.org//Modules/FindFLTK.cmake Wed Sep 24 11:34:34 2008 81 +++ cmake-2.6.2/Modules/FindFLTK.cmake Thu May 21 16:21:06 2009 82 @@ -78,11 +78,14 @@ 83 ${FLTK_DIR_SEARCH} 84 85 # Look in standard UNIX install locations. 86 - /usr/local/lib/fltk 87 +# Uncomment the following to enable /usr/local search 88 +# /usr/local/lib/fltk 89 /usr/lib/fltk 90 - /usr/local/include 91 +# Uncomment the following to enable /usr/local search 92 +# /usr/local/include 93 /usr/include 94 - /usr/local/fltk 95 +# Uncomment the following to enable /usr/local search 96 +# /usr/local/fltk 97 /usr/X11R6/include 98 99 # Read from the CMakeSetup registry entries. It is likely that 100 @@ -173,7 +176,8 @@ 101 ENDIF(FLTK_FLUID_EXECUTABLE) 102 103 SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} 104 - /usr/local/fltk 105 +# Uncomment the following to enable /usr/local search 106 +# /usr/local/fltk 107 /usr/X11R6/include 108 ) 109 110 @@ -180,7 +184,8 @@ 111 FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.h ${FLTK_INCLUDE_SEARCH_PATH}) 112 113 SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} 114 - /usr/local/fltk/lib 115 +# Uncomment the following to enable /usr/local search 116 +# /usr/local/fltk/lib 117 /usr/X11R6/lib 118 ${FLTK_INCLUDE_DIR}/lib 119 ) 120 diff -ru cmake-2.6.2.org//Modules/FindFLTK2.cmake cmake-2.6.2/Modules/FindFLTK2.cmake 121 --- cmake-2.6.2.org//Modules/FindFLTK2.cmake Wed Sep 24 11:34:34 2008 122 +++ cmake-2.6.2/Modules/FindFLTK2.cmake Thu May 21 16:21:07 2009 123 @@ -74,11 +74,14 @@ 124 ${FLTK2_DIR_SEARCH} 125 126 # Look in standard UNIX install locations. 127 - /usr/local/lib/fltk2 128 +# Uncomment the following to enable /usr/local search 129 +# /usr/local/lib/fltk2 130 /usr/lib/fltk2 131 - /usr/local/include 132 +# Uncomment the following to enable /usr/local search 133 +# /usr/local/include 134 /usr/include 135 - /usr/local/fltk2 136 +# Uncomment the following to enable /usr/local search 137 +# /usr/local/fltk2 138 /usr/X11R6/include 139 140 # Read from the CMakeSetup registry entries. It is likely that 141 @@ -184,9 +187,11 @@ 142 ENDIF(FLTK2_FLUID_EXECUTABLE) 143 144 SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH} 145 - /usr/local/include 146 +# Uncomment the following to enable /usr/local search 147 +# /usr/local/include 148 /usr/include 149 - /usr/local/fltk2 150 +# Uncomment the following to enable /usr/local search 151 +# /usr/local/fltk2 152 /usr/X11R6/include 153 ) 154 155 @@ -194,8 +199,9 @@ 156 157 SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH} 158 /usr/lib 159 - /usr/local/lib 160 - /usr/local/fltk2/lib 161 +# Uncomment the following to enable /usr/local search 162 +# /usr/local/lib 163 +# /usr/local/fltk2/lib 164 /usr/X11R6/lib 165 ${FLTK2_INCLUDE_DIR}/lib 166 ) 167 diff -ru cmake-2.6.2.org//Modules/FindFreetype.cmake cmake-2.6.2/Modules/FindFreetype.cmake 168 --- cmake-2.6.2.org//Modules/FindFreetype.cmake Wed Sep 24 11:34:34 2008 169 +++ cmake-2.6.2/Modules/FindFreetype.cmake Thu May 21 16:21:07 2009 170 @@ -33,8 +33,9 @@ 171 $ENV{FREETYPE_DIR} 172 PATH_SUFFIXES include 173 PATHS 174 - /usr/local/X11R6/include 175 - /usr/local/X11/include 176 +# Uncomment the following to enable /usr/local search 177 +# /usr/local/X11R6/include 178 +# /usr/local/X11/include 179 /usr/X11/include 180 /sw/include 181 /opt/local/include 182 @@ -45,8 +46,9 @@ 183 HINTS 184 $ENV{FREETYPE_DIR}/include/freetype2 185 PATHS 186 - /usr/local/X11R6/include 187 - /usr/local/X11/include 188 +# Uncomment the following to enable /usr/local search 189 +# /usr/local/X11R6/include 190 +# /usr/local/X11/include 191 /usr/X11/include 192 /sw/include 193 /opt/local/include 194 @@ -60,8 +62,9 @@ 195 $ENV{FREETYPE_DIR} 196 PATH_SUFFIXES lib64 lib 197 PATHS 198 - /usr/local/X11R6 199 - /usr/local/X11 200 +# Uncomment the following to enable /usr/local search 201 +# /usr/local/X11R6 202 +# /usr/local/X11 203 /usr/X11 204 /sw 205 /usr/freeware 206 diff -ru cmake-2.6.2.org//Modules/FindGDAL.cmake cmake-2.6.2/Modules/FindGDAL.cmake 207 --- cmake-2.6.2.org//Modules/FindGDAL.cmake Wed Sep 24 11:34:34 2008 208 +++ cmake-2.6.2/Modules/FindGDAL.cmake Thu May 21 16:21:07 2009 209 @@ -26,9 +26,10 @@ 210 PATHS 211 ~/Library/Frameworks/gdal.framework/Headers 212 /Library/Frameworks/gdal.framework/Headers 213 - /usr/local/include/gdal 214 - /usr/local/include/GDAL 215 - /usr/local/include 216 +# Uncomment the following to enable /usr/local search 217 +# /usr/local/include/gdal 218 +# /usr/local/include/GDAL 219 +# /usr/local/include 220 /usr/include/gdal 221 /usr/include/GDAL 222 /usr/include 223 @@ -38,9 +39,10 @@ 224 /opt/local/include/gdal 225 /opt/local/include/GDAL 226 /opt/local/include # DarwinPorts 227 - /opt/csw/include/gdal 228 - /opt/csw/include/GDAL 229 - /opt/csw/include # Blastwave 230 +# Uncomment the following to enable /opt/csw search 231 +# /opt/csw/include/gdal 232 +# /opt/csw/include/GDAL 233 +# /opt/csw/include # Blastwave 234 /opt/include/gdal 235 /opt/include/GDAL 236 /opt/include 237 @@ -54,11 +56,13 @@ 238 PATHS 239 ~/Library/Frameworks 240 /Library/Frameworks 241 - /usr/local 242 +# Uncomment the following to enable /usr/local search 243 +# /usr/local 244 /usr 245 /sw 246 /opt/local 247 - /opt/csw 248 +# Uncomment the following to enable /opt/csw search 249 +# /opt/csw 250 /opt 251 /usr/freeware 252 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib 253 diff -ru cmake-2.6.2.org//Modules/FindGIF.cmake cmake-2.6.2/Modules/FindGIF.cmake 254 --- cmake-2.6.2.org//Modules/FindGIF.cmake Wed Sep 24 11:34:34 2008 255 +++ cmake-2.6.2/Modules/FindGIF.cmake Thu May 21 16:21:07 2009 256 @@ -32,11 +32,13 @@ 257 PATHS 258 ~/Library/Frameworks 259 /Library/Frameworks 260 - /usr/local 261 +# Uncomment the following to enable /usr/local search 262 +# /usr/local 263 /usr 264 /sw 265 /opt/local 266 - /opt/csw 267 +# Uncomment the following to enable /opt/csw search 268 +# /opt/csw 269 /opt 270 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 271 /usr/freeware 272 diff -ru cmake-2.6.2.org//Modules/FindGTK.cmake cmake-2.6.2/Modules/FindGTK.cmake 273 --- cmake-2.6.2.org//Modules/FindGTK.cmake Wed Sep 24 11:34:34 2008 274 +++ cmake-2.6.2/Modules/FindGTK.cmake Thu May 21 16:21:07 2009 275 @@ -23,9 +23,11 @@ 276 FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h 277 PATHS 278 /usr/openwin/share/include 279 - /usr/local/include/glib12 280 +# Uncomment the following to enable /usr/local search 281 +# /usr/local/include/glib12 282 /usr/lib/glib/include 283 - /usr/local/lib/glib/include 284 +# Uncomment the following to enable /usr/local search 285 +# /usr/local/lib/glib/include 286 /opt/gnome/include 287 /opt/gnome/lib/glib/include 288 ) 289 diff -ru cmake-2.6.2.org//Modules/FindITK.cmake cmake-2.6.2/Modules/FindITK.cmake 290 --- cmake-2.6.2.org//Modules/FindITK.cmake Wed Sep 24 11:34:34 2008 291 +++ cmake-2.6.2/Modules/FindITK.cmake Thu May 21 16:21:07 2009 292 @@ -50,7 +50,8 @@ 293 ${ITK_DIR_SEARCH} 294 295 # Look in standard UNIX install locations. 296 - /usr/local/lib/InsightToolkit 297 +# Uncomment the following to enable /usr/local search 298 +# /usr/local/lib/InsightToolkit 299 /usr/lib/InsightToolkit 300 301 # Read from the CMakeSetup registry entries. It is likely that 302 diff -ru cmake-2.6.2.org//Modules/FindJNI.cmake cmake-2.6.2/Modules/FindJNI.cmake 303 --- cmake-2.6.2.org//Modules/FindJNI.cmake Wed Sep 24 11:34:34 2008 304 +++ cmake-2.6.2/Modules/FindJNI.cmake Thu May 21 16:21:07 2009 305 @@ -23,23 +23,27 @@ 306 $ENV{JAVA_HOME}/jre/lib/amd64 307 $ENV{JAVA_HOME}/jre/lib/ppc 308 /usr/lib 309 - /usr/local/lib 310 +# Uncomment the following to enable /usr/local search 311 +# /usr/local/lib 312 /usr/lib/jvm/java/lib 313 /usr/lib/java/jre/lib/i386 314 - /usr/local/lib/java/jre/lib/i386 315 - /usr/local/share/java/jre/lib/i386 316 +# Uncomment the following to enable /usr/local search 317 +# /usr/local/lib/java/jre/lib/i386 318 +# /usr/local/share/java/jre/lib/i386 319 /usr/lib/j2sdk1.4-sun/jre/lib/i386 320 /usr/lib/j2sdk1.5-sun/jre/lib/i386 321 /opt/sun-jdk-1.5.0.04/jre/lib/amd64 322 /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64 323 /usr/lib/java/jre/lib/amd64 324 - /usr/local/lib/java/jre/lib/amd64 325 - /usr/local/share/java/jre/lib/amd64 326 +# Uncomment the following to enable /usr/local search 327 +# /usr/local/lib/java/jre/lib/amd64 328 +# /usr/local/share/java/jre/lib/amd64 329 /usr/lib/j2sdk1.4-sun/jre/lib/amd64 330 /usr/lib/j2sdk1.5-sun/jre/lib/amd64 331 /usr/lib/java/jre/lib/ppc 332 - /usr/local/lib/java/jre/lib/ppc 333 - /usr/local/share/java/jre/lib/ppc 334 +# Uncomment the following to enable /usr/local search 335 +# /usr/local/lib/java/jre/lib/ppc 336 +# /usr/local/share/java/jre/lib/ppc 337 /usr/lib/j2sdk1.4-sun/jre/lib/ppc 338 /usr/lib/j2sdk1.5-sun/jre/lib/ppc 339 ) 340 @@ -61,12 +65,15 @@ 341 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" 342 $ENV{JAVA_HOME}/include 343 /usr/include 344 - /usr/local/include 345 +# Uncomment the following to enable /usr/local search 346 +# /usr/local/include 347 /usr/lib/java/include 348 - /usr/local/lib/java/include 349 +# Uncomment the following to enable /usr/local search 350 +# /usr/local/lib/java/include 351 /usr/lib/jvm/java/include 352 /usr/lib/jvm/java-6-sun-1.6.0.00/include 353 - /usr/local/share/java/include 354 +# Uncomment the following to enable /usr/local search 355 +# /usr/local/share/java/include 356 /usr/lib/j2sdk1.4-sun/include 357 /usr/lib/j2sdk1.5-sun/include 358 /opt/sun-jdk-1.5.0.04/include 359 diff -ru cmake-2.6.2.org//Modules/FindJava.cmake cmake-2.6.2/Modules/FindJava.cmake 360 --- cmake-2.6.2.org//Modules/FindJava.cmake Wed Sep 24 11:34:34 2008 361 +++ cmake-2.6.2/Modules/FindJava.cmake Thu May 21 16:21:07 2009 362 @@ -20,9 +20,10 @@ 363 /usr/bin 364 /usr/lib/java/bin 365 /usr/share/java/bin 366 - /usr/local/bin 367 - /usr/local/java/bin 368 - /usr/local/java/share/bin 369 +# Uncomment the following to enable /usr/local search 370 +# /usr/local/bin 371 +# /usr/local/java/bin 372 +# /usr/local/java/share/bin 373 /usr/java/j2sdk1.4.2_04 374 /usr/lib/j2sdk1.4-sun/bin 375 /usr/java/j2sdk1.4.2_09/bin 376 diff -ru cmake-2.6.2.org//Modules/FindKDE3.cmake cmake-2.6.2/Modules/FindKDE3.cmake 377 --- cmake-2.6.2.org//Modules/FindKDE3.cmake Wed Sep 24 11:34:34 2008 378 +++ cmake-2.6.2/Modules/FindKDE3.cmake Thu May 21 16:21:07 2009 379 @@ -127,7 +127,8 @@ 380 /opt/kde3/include 381 /opt/kde/include 382 /usr/include/kde 383 - /usr/local/include/kde 384 +# Uncomment the following to enable /usr/local search 385 +# /usr/local/include/kde 386 ) 387 388 #now the KDE library directory 389 diff -ru cmake-2.6.2.org//Modules/FindLAPACK.cmake cmake-2.6.2/Modules/FindLAPACK.cmake 390 --- cmake-2.6.2.org//Modules/FindLAPACK.cmake Wed Sep 24 11:34:34 2008 391 +++ cmake-2.6.2/Modules/FindLAPACK.cmake Thu May 21 16:21:07 2009 392 @@ -80,7 +80,9 @@ 393 endif(BLA_STATIC) 394 find_library(${_prefix}_${_library}_LIBRARY 395 NAMES ${_library} 396 - PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH 397 + PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH 398 +# Uncomment the following to enable /usr/local search 399 +# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH 400 ) 401 endif(APPLE) 402 403 diff -ru cmake-2.6.2.org//Modules/FindLua50.cmake cmake-2.6.2/Modules/FindLua50.cmake 404 --- cmake-2.6.2.org//Modules/FindLua50.cmake Wed Sep 24 11:34:34 2008 405 +++ cmake-2.6.2/Modules/FindLua50.cmake Thu May 21 16:21:07 2009 406 @@ -19,11 +19,13 @@ 407 PATHS 408 ~/Library/Frameworks 409 /Library/Frameworks 410 - /usr/local 411 +# Uncomment the following to enable /usr/local search 412 +# /usr/local 413 /usr 414 /sw # Fink 415 /opt/local # DarwinPorts 416 - /opt/csw # Blastwave 417 +# Uncomment the following to enable /opt/csw search 418 +# /opt/csw # Blastwave 419 /opt 420 ) 421 422 @@ -31,15 +33,17 @@ 423 NAMES lua50 lua5.0 lua5 lua 424 HINTS 425 $ENV{LUA_DIR} 426 - PATH_SUFFIXES lib64 lib 427 + PATH_SUFFIXES lib64 lib lib/32 lib/64 428 PATHS 429 ~/Library/Frameworks 430 /Library/Frameworks 431 - /usr/local 432 +# Uncomment the following to enable /usr/local search 433 +# /usr/local 434 /usr 435 /sw 436 /opt/local 437 - /opt/csw 438 +# Uncomment the following to enable /opt/csw search 439 +# /opt/csw 440 /opt 441 ) 442 443 @@ -55,11 +59,13 @@ 444 $ENV{LUA_DIR} 445 PATH_SUFFIXES lib64 lib 446 PATHS 447 - /usr/local 448 +# Uncomment the following to enable /usr/local search 449 +# /usr/local 450 /usr 451 /sw 452 /opt/local 453 - /opt/csw 454 +# Uncomment the following to enable /opt/csw search 455 +# /opt/csw 456 /opt 457 ) 458 IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua) 459 diff -ru cmake-2.6.2.org//Modules/FindLua51.cmake cmake-2.6.2/Modules/FindLua51.cmake 460 --- cmake-2.6.2.org//Modules/FindLua51.cmake Wed Sep 24 11:34:34 2008 461 +++ cmake-2.6.2/Modules/FindLua51.cmake Thu May 21 16:21:07 2009 462 @@ -19,11 +19,13 @@ 463 PATHS 464 ~/Library/Frameworks 465 /Library/Frameworks 466 - /usr/local 467 +# Uncomment the following to enable /usr/local search 468 +# /usr/local 469 /usr 470 /sw # Fink 471 /opt/local # DarwinPorts 472 - /opt/csw # Blastwave 473 +# Uncomment the following to enable /opt/csw search 474 +# /opt/csw # Blastwave 475 /opt 476 ) 477 478 @@ -31,15 +33,17 @@ 479 NAMES lua51 lua5.1 lua 480 HINTS 481 $ENV{LUA_DIR} 482 - PATH_SUFFIXES lib64 lib 483 + PATH_SUFFIXES lib64 lib lib/32 lib/64 484 PATHS 485 ~/Library/Frameworks 486 /Library/Frameworks 487 - /usr/local 488 +# Uncomment the following to enable /usr/local search 489 +# /usr/local 490 /usr 491 /sw 492 /opt/local 493 - /opt/csw 494 +# Uncomment the following to enable /opt/csw search 495 +# /opt/csw 496 /opt 497 ) 498 499 diff -ru cmake-2.6.2.org//Modules/FindMPI.cmake cmake-2.6.2/Modules/FindMPI.cmake 500 --- cmake-2.6.2.org//Modules/FindMPI.cmake Wed Sep 24 11:34:34 2008 501 +++ cmake-2.6.2/Modules/FindMPI.cmake Thu May 21 16:21:07 2009 502 @@ -243,10 +243,12 @@ 503 set(MPI_LINK_FLAGS ${MPI_LINK_FLAGS_WORK} CACHE STRING "MPI linking flags" FORCE) 504 else (MPI_COMPILE_CMDLINE) 505 find_path(MPI_INCLUDE_PATH mpi.h 506 - /usr/local/include 507 +# Uncomment the following to enable /usr/local search 508 +# /usr/local/include 509 /usr/include 510 /usr/include/mpi 511 - /usr/local/mpi/include 512 +# Uncomment the following to enable /usr/local search 513 +# /usr/local/mpi/include 514 "C:/Program Files/MPICH/SDK/Include" 515 "$ENV{SystemDrive}/Program Files/MPICH2/include" 516 "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include" 517 @@ -261,7 +263,9 @@ 518 519 find_library(MPI_LIBRARY 520 NAMES mpi mpich msmpi 521 - PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib 522 + PATHS /usr/lib /usr/lib/32 /usr/lib/64 523 +# Uncomment the following to enable /usr/local search 524 +# PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib 525 "C:/Program Files/MPICH/SDK/Lib" 526 "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib" 527 "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}" 528 @@ -273,7 +277,9 @@ 529 530 find_library(MPI_EXTRA_LIBRARY 531 NAMES mpi++ 532 - PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib 533 + PATHS /usr/lib /usr/lib/32 /usr/lib/64 534 +# Uncomment the following to enable /usr/local search 535 +# PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib 536 "C:/Program Files/MPICH/SDK/Lib" 537 DOC "Extra MPI libraries to link against.") 538 539 diff -ru cmake-2.6.2.org//Modules/FindOpenAL.cmake cmake-2.6.2/Modules/FindOpenAL.cmake 540 --- cmake-2.6.2.org//Modules/FindOpenAL.cmake Wed Sep 24 11:34:34 2008 541 +++ cmake-2.6.2/Modules/FindOpenAL.cmake Thu May 21 16:21:07 2009 542 @@ -55,11 +55,13 @@ 543 PATHS 544 ~/Library/Frameworks 545 /Library/Frameworks 546 - /usr/local 547 +# Uncomment the following to enable /usr/local search 548 +# /usr/local 549 /usr 550 /sw # Fink 551 /opt/local # DarwinPorts 552 - /opt/csw # Blastwave 553 +# Uncomment the following to enable /opt/csw search 554 +# /opt/csw # Blastwave 555 /opt 556 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] 557 ) 558 @@ -68,15 +70,17 @@ 559 NAMES OpenAL al openal OpenAL32 560 HINTS 561 $ENV{OPENALDIR} 562 - PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 563 + PATH_SUFFIXES lib64 lib lib/32 lib/64 libs64 libs libs/Win32 libs/Win64 564 PATHS 565 ~/Library/Frameworks 566 /Library/Frameworks 567 - /usr/local 568 +# Uncomment the following to enable /usr/local search 569 +# /usr/local 570 /usr 571 /sw 572 /opt/local 573 - /opt/csw 574 +# Uncomment the following to enable /opt/csw search 575 +# /opt/csw 576 /opt 577 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] 578 ) 579 diff -ru cmake-2.6.2.org//Modules/FindOpenThreads.cmake cmake-2.6.2/Modules/FindOpenThreads.cmake 580 --- cmake-2.6.2.org//Modules/FindOpenThreads.cmake Wed Sep 24 11:34:34 2008 581 +++ cmake-2.6.2/Modules/FindOpenThreads.cmake Thu May 21 16:21:07 2009 582 @@ -51,11 +51,13 @@ 583 PATHS 584 ~/Library/Frameworks 585 /Library/Frameworks 586 - /usr/local/include 587 +# Uncomment the following to enable /usr/local search 588 +# /usr/local/include 589 /usr/include 590 /sw/include # Fink 591 /opt/local/include # DarwinPorts 592 - /opt/csw/include # Blastwave 593 +# Uncomment the following to enable /opt/csw search 594 +# /opt/csw/include # Blastwave 595 /opt/include 596 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include 597 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include 598 @@ -79,16 +81,20 @@ 599 PATHS 600 ~/Library/Frameworks 601 /Library/Frameworks 602 - /usr/local/lib64 603 - /usr/local/lib 604 +# Uncomment the following to enable /usr/local search 605 +# /usr/local/lib64 606 +# /usr/local/lib 607 /usr/lib64 608 /usr/lib 609 + /usr/lib/32 610 + /usr/lib/64 611 /sw/lib64 612 /sw/lib 613 /opt/local/lib64 614 /opt/local/lib 615 - /opt/csw/lib64 616 - /opt/csw/lib 617 +# Uncomment the following to enable /opt/csw search 618 +# /opt/csw/lib64 619 +# /opt/csw/lib 620 /opt/lib64 621 /opt/lib 622 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib 623 @@ -112,16 +118,20 @@ 624 $ENV{OSGDIR}/lib 625 $ENV{OSGDIR} 626 PATHS 627 - /usr/local/lib64 628 - /usr/local/lib 629 +# Uncomment the following to enable /usr/local search 630 +# /usr/local/lib64 631 +# /usr/local/lib 632 /usr/lib64 633 /usr/lib 634 + /usr/lib/32 635 + /usr/lib/64 636 /sw/lib64 637 /sw/lib 638 /opt/local/lib64 639 /opt/local/lib 640 - /opt/csw/lib64 641 - /opt/csw/lib 642 +# Uncomment the following to enable /opt/csw search 643 +# /opt/csw/lib64 644 +# /opt/csw/lib 645 /opt/lib64 646 /opt/lib 647 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib 648 diff -ru cmake-2.6.2.org//Modules/FindPHP4.cmake cmake-2.6.2/Modules/FindPHP4.cmake 649 --- cmake-2.6.2.org//Modules/FindPHP4.cmake Wed Sep 24 11:34:34 2008 650 +++ cmake-2.6.2/Modules/FindPHP4.cmake Thu May 21 16:21:07 2009 651 @@ -9,10 +9,12 @@ 652 653 SET(PHP4_POSSIBLE_INCLUDE_PATHS 654 /usr/include/php4 655 - /usr/local/include/php4 656 + /usr/php4/include 657 +# Uncomment the following to enable /usr/local search 658 +# /usr/local/include/php4 659 /usr/include/php 660 - /usr/local/include/php 661 - /usr/local/apache/php 662 +# /usr/local/include/php 663 +# /usr/local/apache/php 664 ) 665 666 SET(PHP4_POSSIBLE_LIB_PATHS 667 diff -ru cmake-2.6.2.org//Modules/FindPNG.cmake cmake-2.6.2/Modules/FindPNG.cmake 668 --- cmake-2.6.2.org//Modules/FindPNG.cmake Wed Sep 24 11:34:34 2008 669 +++ cmake-2.6.2/Modules/FindPNG.cmake Thu May 21 16:21:07 2009 670 @@ -13,7 +13,9 @@ 671 672 IF(ZLIB_FOUND) 673 FIND_PATH(PNG_PNG_INCLUDE_DIR png.h 674 - /usr/local/include/libpng # OpenBSD 675 + /usr/include/libpng 676 +# Uncomment the following to enable /usr/local search 677 +# /usr/local/include/libpng # OpenBSD 678 ) 679 680 SET(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12) 681 diff -ru cmake-2.6.2.org//Modules/FindPhysFS.cmake cmake-2.6.2/Modules/FindPhysFS.cmake 682 --- cmake-2.6.2.org//Modules/FindPhysFS.cmake Wed Sep 24 11:34:34 2008 683 +++ cmake-2.6.2/Modules/FindPhysFS.cmake Thu May 21 16:21:07 2009 684 @@ -17,11 +17,13 @@ 685 PATHS 686 ~/Library/Frameworks 687 /Library/Frameworks 688 - /usr/local 689 +# Uncomment the following to enable /usr/local search 690 +# /usr/local 691 /usr 692 /sw # Fink 693 /opt/local # DarwinPorts 694 - /opt/csw # Blastwave 695 +# Uncomment the following to enable /opt/csw search 696 +# /opt/csw # Blastwave 697 /opt 698 ) 699 700 @@ -29,15 +31,17 @@ 701 NAMES physfs 702 HINTS 703 $ENV{PHYSFSDIR} 704 - PATH_SUFFIXES lib64 lib 705 + PATH_SUFFIXES lib64 lib lib/32 lib/64 706 PATHS 707 ~/Library/Frameworks 708 /Library/Frameworks 709 - /usr/local 710 +# Uncomment the following to enable /usr/local search 711 +# /usr/local 712 /usr 713 /sw 714 /opt/local 715 - /opt/csw 716 +# Uncomment the following to enable /opt/csw search 717 +# /opt/csw 718 /opt 719 ) 720 721 diff -ru cmake-2.6.2.org//Modules/FindPike.cmake cmake-2.6.2/Modules/FindPike.cmake 722 --- cmake-2.6.2.org//Modules/FindPike.cmake Wed Sep 24 11:34:34 2008 723 +++ cmake-2.6.2/Modules/FindPike.cmake Thu May 21 16:21:07 2009 724 @@ -9,7 +9,9 @@ 725 726 FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS 727 /usr/include/pike/* 728 - /usr/local/include/pike/*) 729 +# Uncomment the following to enable /usr/local search 730 +# /usr/local/include/pike/* 731 + ) 732 733 FIND_PATH(PIKE_INCLUDE_PATH program.h 734 ${PIKE_POSSIBLE_INCLUDE_PATHS}) 735 diff -ru cmake-2.6.2.org//Modules/FindProducer.cmake cmake-2.6.2/Modules/FindProducer.cmake 736 --- cmake-2.6.2.org//Modules/FindProducer.cmake Wed Sep 24 11:34:34 2008 737 +++ cmake-2.6.2/Modules/FindProducer.cmake Thu May 21 16:21:07 2009 738 @@ -38,11 +38,13 @@ 739 PATHS 740 ~/Library/Frameworks 741 /Library/Frameworks 742 - /usr/local/include 743 +# Uncomment the following to enable /usr/local search 744 +# /usr/local/include 745 /usr/include 746 /sw/include # Fink 747 /opt/local/include # DarwinPorts 748 - /opt/csw/include # Blastwave 749 +# Uncomment the following to enable /opt/csw search 750 +# /opt/csw/include # Blastwave 751 /opt/include 752 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include 753 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include 754 @@ -54,13 +56,15 @@ 755 $ENV{PRODUCER_DIR} 756 $ENV{OSG_DIR} 757 $ENV{OSGDIR} 758 - PATH_SUFFIXES lib64 lib 759 + PATH_SUFFIXES lib64 lib lib/32 lib/64 760 PATHS 761 - /usr/local 762 +# Uncomment the following to enable /usr/local search 763 +# /usr/local 764 /usr 765 /sw 766 /opt/local 767 - /opt/csw 768 +# Uncomment the following to enable /opt/csw search 769 +# /opt/csw 770 /opt 771 ) 772 773 diff -ru cmake-2.6.2.org//Modules/FindQt.cmake cmake-2.6.2/Modules/FindQt.cmake 774 --- cmake-2.6.2.org//Modules/FindQt.cmake Wed Sep 24 11:34:34 2008 775 +++ cmake-2.6.2/Modules/FindQt.cmake Thu May 21 16:21:07 2009 776 @@ -70,8 +70,9 @@ 777 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" 778 ${qt_headers}/Qt 779 $ENV{QTDIR}/include/Qt 780 - /usr/local/qt/include/Qt 781 - /usr/local/include/Qt 782 +# Uncomment the following to enable /usr/local search 783 +# /usr/local/qt/include/Qt 784 +# /usr/local/include/Qt 785 /usr/lib/qt/include/Qt 786 /usr/include/Qt 787 /usr/share/qt4/include/Qt 788 @@ -89,8 +90,9 @@ 789 C:/Qt/3.3.3Educational/include 790 $ENV{QTDIR}/include 791 /usr/include/qt3/Qt 792 - /usr/local/qt/include 793 - /usr/local/include 794 +# Uncomment the following to enable /usr/local search 795 +# /usr/local/qt/include 796 +# /usr/local/include 797 /usr/lib/qt/include 798 /usr/include 799 /usr/share/qt3/include 800 diff -ru cmake-2.6.2.org//Modules/FindQt3.cmake cmake-2.6.2/Modules/FindQt3.cmake 801 --- cmake-2.6.2.org//Modules/FindQt3.cmake Wed Sep 24 11:34:34 2008 802 +++ cmake-2.6.2/Modules/FindQt3.cmake Thu May 21 16:21:07 2009 803 @@ -40,7 +40,8 @@ 804 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" 805 $ENV{QTDIR}/include 806 ${GLOB_PATHS_BIN} 807 - /usr/local/qt/include 808 +# Uncomment the following to enable /usr/local search 809 +# /usr/local/qt/include 810 /usr/lib/qt/include 811 /usr/lib/qt3/include 812 /usr/include/qt 813 @@ -78,7 +79,8 @@ 814 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" 815 $ENV{QTDIR}/lib 816 ${GLOB_PATHS_LIB} 817 - /usr/local/qt/lib 818 +# Uncomment the following to enable /usr/local search 819 +# /usr/local/qt/lib 820 /usr/lib/qt/lib 821 /usr/lib/qt3/lib 822 /usr/lib/qt3/lib64 823 @@ -98,7 +100,8 @@ 824 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" 825 $ENV{QTDIR}/lib 826 ${GLOB_PATHS_LIB} 827 - /usr/local/qt/lib 828 +# Uncomment the following to enable /usr/local search 829 +# /usr/local/qt/lib 830 /usr/lib/qt/lib 831 /usr/lib/qt3/lib 832 /usr/lib/qt3/lib64 833 @@ -116,7 +119,8 @@ 834 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" 835 $ENV{QTDIR}/lib 836 ${GLOB_PATHS_LIB} 837 - /usr/local/qt/lib 838 +# Uncomment the following to enable /usr/local search 839 +# /usr/local/qt/lib 840 /usr/lib/qt3/lib 841 /usr/lib/qt3/lib64 842 /usr/share/qt3/lib 843 @@ -134,7 +138,8 @@ 844 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" 845 $ENV{QTDIR}/bin 846 ${GLOB_PATHS_BIN} 847 - /usr/local/qt/bin 848 +# Uncomment the following to enable /usr/local search 849 +# /usr/local/qt/bin 850 /usr/lib/qt/bin 851 /usr/lib/qt3/bin 852 /usr/share/qt3/bin 853 @@ -155,7 +160,8 @@ 854 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" 855 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" 856 ${GLOB_PATHS_BIN} 857 - /usr/local/qt/bin 858 +# Uncomment the following to enable /usr/local search 859 +# /usr/local/qt/bin 860 /usr/lib/qt/bin 861 /usr/lib/qt3/bin 862 /usr/share/qt3/bin 863 diff -ru cmake-2.6.2.org//Modules/FindSDL.cmake cmake-2.6.2/Modules/FindSDL.cmake 864 --- cmake-2.6.2.org//Modules/FindSDL.cmake Wed Sep 24 11:34:34 2008 865 +++ cmake-2.6.2/Modules/FindSDL.cmake Thu May 21 16:21:07 2009 866 @@ -59,20 +59,23 @@ 867 PATHS 868 ~/Library/Frameworks 869 /Library/Frameworks 870 - /usr/local/include/SDL 871 +# Uncomment the following to enable /usr/local search 872 +# /usr/local/include/SDL 873 /usr/include/SDL 874 - /usr/local/include/SDL12 875 - /usr/local/include/SDL11 # FreeBSD ports 876 +# Uncomment the following to enable /usr/local search 877 +# /usr/local/include/SDL12 878 +# /usr/local/include/SDL11 # FreeBSD ports 879 /usr/include/SDL12 880 /usr/include/SDL11 881 - /usr/local/include 882 +# /usr/local/include 883 /usr/include 884 /sw/include/SDL # Fink 885 /sw/include 886 /opt/local/include/SDL # DarwinPorts 887 /opt/local/include 888 - /opt/csw/include/SDL # Blastwave 889 - /opt/csw/include 890 +# Uncomment the following to enable /opt/csw search 891 +# /opt/csw/include/SDL # Blastwave 892 +# /opt/csw/include 893 /opt/include/SDL 894 /opt/include 895 ) 896 @@ -86,11 +89,13 @@ 897 $ENV{SDLDIR} 898 PATH_SUFFIXES lib64 lib 899 PATHS 900 - /usr/local 901 +# Uncomment the following to enable /usr/local search 902 +# /usr/local 903 /usr 904 /sw 905 /opt/local 906 - /opt/csw 907 +# Uncomment the following to enable /opt/csw search 908 +# /opt/csw 909 /opt 910 ) 911 912 @@ -108,11 +113,13 @@ 913 $ENV{SDLDIR} 914 PATH_SUFFIXES lib64 lib 915 PATHS 916 - /usr/local 917 +# Uncomment the following to enable /usr/local search 918 +# /usr/local 919 /usr 920 /sw 921 /opt/local 922 - /opt/csw 923 +# Uncomment the following to enable /opt/csw search 924 +# /opt/csw 925 /opt 926 ) 927 ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") 928 diff -ru cmake-2.6.2.org//Modules/FindSDL_image.cmake cmake-2.6.2/Modules/FindSDL_image.cmake 929 --- cmake-2.6.2.org//Modules/FindSDL_image.cmake Wed Sep 24 11:34:34 2008 930 +++ cmake-2.6.2/Modules/FindSDL_image.cmake Thu May 21 16:21:07 2009 931 @@ -20,20 +20,24 @@ 932 PATHS 933 ~/Library/Frameworks 934 /Library/Frameworks 935 - /usr/local/include/SDL 936 +# Uncomment the following to enable /usr/local search 937 +# /usr/local/include/SDL 938 /usr/include/SDL 939 - /usr/local/include/SDL12 940 - /usr/local/include/SDL11 # FreeBSD ports 941 +# Uncomment the following to enable /usr/local search 942 +# /usr/local/include/SDL12 943 +# /usr/local/include/SDL11 # FreeBSD ports 944 /usr/include/SDL12 945 /usr/include/SDL11 946 - /usr/local/include 947 +# Uncomment the following to enable /usr/local search 948 +# /usr/local/include 949 /usr/include 950 /sw/include/SDL # Fink 951 /sw/include 952 /opt/local/include/SDL # DarwinPorts 953 /opt/local/include 954 - /opt/csw/include/SDL # Blastwave 955 - /opt/csw/include 956 +# Uncomment the following to enable /opt/csw search 957 +# /opt/csw/include/SDL # Blastwave 958 +# /opt/csw/include 959 /opt/include/SDL 960 /opt/include 961 ) 962 @@ -47,11 +51,13 @@ 963 PATHS 964 ~/Library/Frameworks 965 /Library/Frameworks 966 - /usr/local 967 +# Uncomment the following to enable /usr/local search 968 +# /usr/local 969 /usr 970 /sw 971 /opt/local 972 - /opt/csw 973 +# Uncomment the following to enable /opt/csw search 974 +# /opt/csw 975 /opt 976 ) 977 978 diff -ru cmake-2.6.2.org//Modules/FindSDL_mixer.cmake cmake-2.6.2/Modules/FindSDL_mixer.cmake 979 --- cmake-2.6.2.org//Modules/FindSDL_mixer.cmake Wed Sep 24 11:34:34 2008 980 +++ cmake-2.6.2/Modules/FindSDL_mixer.cmake Thu May 21 16:21:07 2009 981 @@ -20,20 +20,24 @@ 982 PATHS 983 ~/Library/Frameworks 984 /Library/Frameworks 985 - /usr/local/include/SDL 986 +# Uncomment the following to enable /usr/local search 987 +# /usr/local/include/SDL 988 /usr/include/SDL 989 - /usr/local/include/SDL12 990 - /usr/local/include/SDL11 # FreeBSD ports 991 +# Uncomment the following to enable /usr/local search 992 +# /usr/local/include/SDL12 993 +# /usr/local/include/SDL11 # FreeBSD ports 994 /usr/include/SDL12 995 /usr/include/SDL11 996 - /usr/local/include 997 +# Uncomment the following to enable /usr/local search 998 +# /usr/local/include 999 /usr/include 1000 /sw/include/SDL # Fink 1001 /sw/include 1002 /opt/local/include/SDL # DarwinPorts 1003 /opt/local/include 1004 - /opt/csw/include/SDL # Blastwave 1005 - /opt/csw/include 1006 +# Uncomment the following to enable /opt/csw search 1007 +# /opt/csw/include/SDL # Blastwave 1008 +# /opt/csw/include 1009 /opt/include/SDL 1010 /opt/include 1011 ) 1012 @@ -43,15 +47,17 @@ 1013 HINTS 1014 $ENV{SDLMIXERDIR} 1015 $ENV{SDLDIR} 1016 - PATH_SUFFIXES lib64 lib 1017 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1018 PATHS 1019 ~/Library/Frameworks 1020 /Library/Frameworks 1021 - /usr/local 1022 +# Uncomment the following to enable /usr/local search 1023 +# /usr/local 1024 /usr 1025 /sw 1026 /opt/local 1027 - /opt/csw 1028 +# Uncomment the following to enable /opt/csw search 1029 +# /opt/csw 1030 /opt 1031 ) 1032 1033 diff -ru cmake-2.6.2.org//Modules/FindSDL_net.cmake cmake-2.6.2/Modules/FindSDL_net.cmake 1034 --- cmake-2.6.2.org//Modules/FindSDL_net.cmake Wed Sep 24 11:34:34 2008 1035 +++ cmake-2.6.2/Modules/FindSDL_net.cmake Thu May 21 16:21:07 2009 1036 @@ -21,20 +21,22 @@ 1037 PATHS 1038 ~/Library/Frameworks 1039 /Library/Frameworks 1040 - /usr/local/include/SDL 1041 +# Uncomment the following to enable /usr/local search 1042 +# /usr/local/include/SDL 1043 /usr/include/SDL 1044 - /usr/local/include/SDL12 1045 - /usr/local/include/SDL11 # FreeBSD ports 1046 +# /usr/local/include/SDL12 1047 +# /usr/local/include/SDL11 # FreeBSD ports 1048 /usr/include/SDL12 1049 /usr/include/SDL11 1050 - /usr/local/include 1051 +# /usr/local/include 1052 /usr/include 1053 /sw/include/SDL # Fink 1054 /sw/include 1055 /opt/local/include/SDL # DarwinPorts 1056 /opt/local/include 1057 - /opt/csw/include/SDL # Blastwave 1058 - /opt/csw/include 1059 +# Uncomment the following to enable /opt/csw search 1060 +# /opt/csw/include/SDL # Blastwave 1061 +# /opt/csw/include 1062 /opt/include/SDL 1063 /opt/include 1064 ) 1065 @@ -43,15 +45,17 @@ 1066 HINTS 1067 $ENV{SDLNETDIR} 1068 $ENV{SDLDIR} 1069 - PATH_SUFFIXES lib64 lib 1070 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1071 PATHS 1072 ~/Library/Frameworks 1073 /Library/Frameworks 1074 - /usr/local 1075 +# Uncomment the following to enable /usr/local search 1076 +# /usr/local 1077 /usr 1078 /sw 1079 /opt/local 1080 - /opt/csw 1081 +# Uncomment the following to enable /opt/csw search 1082 +# /opt/csw 1083 /opt 1084 ) 1085 1086 diff -ru cmake-2.6.2.org//Modules/FindSDL_sound.cmake cmake-2.6.2/Modules/FindSDL_sound.cmake 1087 --- cmake-2.6.2.org//Modules/FindSDL_sound.cmake Wed Sep 24 11:34:34 2008 1088 +++ cmake-2.6.2/Modules/FindSDL_sound.cmake Thu May 21 16:21:07 2009 1089 @@ -68,20 +68,22 @@ 1090 $ENV{SDLDIR}/include 1091 $ENV{SDLDIR} 1092 PATHS 1093 - /usr/local/include/SDL 1094 +# Uncomment the following to enable /usr/local search 1095 +# /usr/local/include/SDL 1096 /usr/include/SDL 1097 - /usr/local/include/SDL12 1098 - /usr/local/include/SDL11 # FreeBSD ports 1099 +# /usr/local/include/SDL12 1100 +# /usr/local/include/SDL11 # FreeBSD ports 1101 /usr/include/SDL12 1102 /usr/include/SDL11 1103 - /usr/local/include 1104 +# /usr/local/include 1105 /usr/include 1106 /sw/include/SDL # Fink 1107 /sw/include 1108 /opt/local/include/SDL # DarwinPorts 1109 /opt/local/include 1110 - /opt/csw/include/SDL # Blastwave 1111 - /opt/csw/include 1112 +# Uncomment the following to enable /opt/csw search 1113 +# /opt/csw/include/SDL # Blastwave 1114 +# /opt/csw/include 1115 /opt/include/SDL 1116 /opt/include 1117 ) 1118 @@ -94,11 +96,13 @@ 1119 $ENV{SDLDIR}/lib 1120 $ENV{SDLDIR} 1121 PATHS 1122 - /usr/local/lib 1123 +# Uncomment the following to enable /usr/local search 1124 +# /usr/local/lib 1125 /usr/lib 1126 /sw/lib 1127 /opt/local/lib 1128 - /opt/csw/lib 1129 +# Uncomment the following to enable /opt/csw search 1130 +# /opt/csw/lib 1131 /opt/lib 1132 ) 1133 1134 @@ -211,11 +215,13 @@ 1135 $ENV{SDLSOUNDDIR} 1136 $ENV{SDLDIR}/lib 1137 $ENV{SDLDIR} 1138 - /usr/local/lib 1139 +# Uncomment the following to enable /usr/local search 1140 +# /usr/local/lib 1141 /usr/lib 1142 /sw/lib 1143 /opt/local/lib 1144 - /opt/csw/lib 1145 +# Uncomment the following to enable /opt/csw search 1146 +# /opt/csw/lib 1147 /opt/lib 1148 ) 1149 IF(MIKMOD_LIBRARY) 1150 @@ -234,11 +240,13 @@ 1151 $ENV{SDLSOUNDDIR} 1152 $ENV{SDLDIR}/lib 1153 $ENV{SDLDIR} 1154 - /usr/local/lib 1155 +# Uncomment the following to enable /usr/local search 1156 +# /usr/local/lib 1157 /usr/lib 1158 /sw/lib 1159 /opt/local/lib 1160 - /opt/csw/lib 1161 +# Uncomment the following to enable /opt/csw search 1162 +# /opt/csw/lib 1163 /opt/lib 1164 ) 1165 IF(MODPLUG_LIBRARY) 1166 @@ -260,11 +268,13 @@ 1167 $ENV{SDLSOUNDDIR} 1168 $ENV{SDLDIR}/lib 1169 $ENV{SDLDIR} 1170 - /usr/local/lib 1171 +# Uncomment the following to enable /usr/local search 1172 +# /usr/local/lib 1173 /usr/lib 1174 /sw/lib 1175 /opt/local/lib 1176 - /opt/csw/lib 1177 +# Uncomment the following to enable /opt/csw search 1178 +# /opt/csw/lib 1179 /opt/lib 1180 ) 1181 IF(VORBIS_LIBRARY) 1182 @@ -282,11 +292,13 @@ 1183 $ENV{SDLSOUNDDIR} 1184 $ENV{SDLDIR}/lib 1185 $ENV{SDLDIR} 1186 - /usr/local/lib 1187 +# Uncomment the following to enable /usr/local search 1188 +# /usr/local/lib 1189 /usr/lib 1190 /sw/lib 1191 /opt/local/lib 1192 - /opt/csw/lib 1193 +# Uncomment the following to enable /opt/csw search 1194 +# /opt/csw/lib 1195 /opt/lib 1196 ) 1197 IF(OGG_LIBRARY) 1198 @@ -306,11 +318,13 @@ 1199 $ENV{SDLSOUNDDIR} 1200 $ENV{SDLDIR}/lib 1201 $ENV{SDLDIR} 1202 - /usr/local/lib 1203 +# Uncomment the following to enable /usr/local search 1204 +# /usr/local/lib 1205 /usr/lib 1206 /sw/lib 1207 /opt/local/lib 1208 - /opt/csw/lib 1209 +# Uncomment the following to enable /opt/csw search 1210 +# /opt/csw/lib 1211 /opt/lib 1212 ) 1213 IF(SMPEG_LIBRARY) 1214 @@ -330,11 +344,13 @@ 1215 $ENV{SDLSOUNDDIR} 1216 $ENV{SDLDIR}/lib 1217 $ENV{SDLDIR} 1218 - /usr/local/lib 1219 +# Uncomment the following to enable /usr/local search 1220 +# /usr/local/lib 1221 /usr/lib 1222 /sw/lib 1223 /opt/local/lib 1224 - /opt/csw/lib 1225 +# Uncomment the following to enable /opt/csw search 1226 +# /opt/csw/lib 1227 /opt/lib 1228 ) 1229 IF(FLAC_LIBRARY) 1230 @@ -357,11 +373,13 @@ 1231 $ENV{SDLSOUNDDIR} 1232 $ENV{SDLDIR}/lib 1233 $ENV{SDLDIR} 1234 - /usr/local/lib 1235 +# Uncomment the following to enable /usr/local search 1236 +# /usr/local/lib 1237 /usr/lib 1238 /sw/lib 1239 /opt/local/lib 1240 - /opt/csw/lib 1241 +# Uncomment the following to enable /opt/csw search 1242 +# /opt/csw/lib 1243 /opt/lib 1244 ) 1245 IF(SPEEX_LIBRARY) 1246 @@ -384,11 +402,13 @@ 1247 $ENV{SDLSOUNDDIR} 1248 $ENV{SDLDIR}/lib 1249 $ENV{SDLDIR} 1250 - /usr/local/lib 1251 +# Uncomment the following to enable /usr/local search 1252 +# /usr/local/lib 1253 /usr/lib 1254 /sw/lib 1255 /opt/local/lib 1256 - /opt/csw/lib 1257 +# Uncomment the following to enable /opt/csw search 1258 +# /opt/csw/lib 1259 /opt/lib 1260 ) 1261 IF(OGG_LIBRARY) 1262 diff -ru cmake-2.6.2.org//Modules/FindSDL_ttf.cmake cmake-2.6.2/Modules/FindSDL_ttf.cmake 1263 --- cmake-2.6.2.org//Modules/FindSDL_ttf.cmake Wed Sep 24 11:34:34 2008 1264 +++ cmake-2.6.2/Modules/FindSDL_ttf.cmake Thu May 21 16:21:07 2009 1265 @@ -20,20 +20,22 @@ 1266 PATHS 1267 ~/Library/Frameworks 1268 /Library/Frameworks 1269 - /usr/local/include/SDL 1270 +# Uncomment the following to enable /usr/local search 1271 +# /usr/local/include/SDL 1272 /usr/include/SDL 1273 - /usr/local/include/SDL12 1274 - /usr/local/include/SDL11 # FreeBSD ports 1275 +# /usr/local/include/SDL12 1276 +# /usr/local/include/SDL11 # FreeBSD ports 1277 /usr/include/SDL12 1278 /usr/include/SDL11 1279 - /usr/local/include 1280 +# /usr/local/include 1281 /usr/include 1282 /sw/include/SDL # Fink 1283 /sw/include 1284 /opt/local/include/SDL # DarwinPorts 1285 /opt/local/include 1286 - /opt/csw/include/SDL # Blastwave 1287 - /opt/csw/include 1288 +# Uncomment the following to enable /opt/csw search 1289 +# /opt/csw/include/SDL # Blastwave 1290 +# /opt/csw/include 1291 /opt/include/SDL 1292 /opt/include 1293 ) 1294 @@ -46,11 +48,13 @@ 1295 PATHS 1296 ~/Library/Frameworks 1297 /Library/Frameworks 1298 - /usr/local 1299 +# Uncomment the following to enable /usr/local search 1300 +# /usr/local 1301 /usr 1302 /sw 1303 /opt/local 1304 - /opt/csw 1305 +# Uncomment the following to enable /opt/csw search 1306 +# /opt/csw 1307 /opt 1308 PATH_SUFFIXES lib64 lib 1309 ) 1310 diff -ru cmake-2.6.2.org//Modules/FindSelfPackers.cmake cmake-2.6.2/Modules/FindSelfPackers.cmake 1311 --- cmake-2.6.2.org//Modules/FindSelfPackers.cmake Wed Sep 24 11:34:34 2008 1312 +++ cmake-2.6.2/Modules/FindSelfPackers.cmake Thu May 21 16:21:07 2009 1313 @@ -12,7 +12,8 @@ 1314 ${CYGWIN_INSTALL_PATH}/bin 1315 /bin 1316 /usr/bin 1317 - /usr/local/bin 1318 +# Uncomment the following to enable /usr/local search 1319 +# /usr/local/bin 1320 /sbin 1321 ) 1322 1323 @@ -21,7 +22,8 @@ 1324 ${CYGWIN_INSTALL_PATH}/bin 1325 /bin 1326 /usr/bin 1327 - /usr/local/bin 1328 +# Uncomment the following to enable /usr/local search 1329 +# /usr/local/bin 1330 /sbin 1331 ) 1332 1333 diff -ru cmake-2.6.2.org//Modules/FindTCL.cmake cmake-2.6.2/Modules/FindTCL.cmake 1334 --- cmake-2.6.2.org//Modules/FindTCL.cmake Wed Sep 24 11:34:34 2008 1335 +++ cmake-2.6.2/Modules/FindTCL.cmake Thu May 21 16:21:07 2009 1336 @@ -66,7 +66,8 @@ 1337 "${TCL_TCLSH_PATH_PARENT}/lib" 1338 "${TK_WISH_PATH_PARENT}/lib" 1339 /usr/lib 1340 - /usr/local/lib 1341 +# Uncomment the following to enable /usr/local search 1342 +# /usr/local/lib 1343 ) 1344 1345 IF(WIN32) 1346 @@ -146,7 +147,8 @@ 1347 "${TCL_TCLSH_PATH_PARENT}/include" 1348 "${TK_WISH_PATH_PARENT}/include" 1349 /usr/include 1350 - /usr/local/include 1351 +# Uncomment the following to enable /usr/local search 1352 +# /usr/local/include 1353 /usr/include/tcl${TK_LIBRARY_VERSION} 1354 /usr/include/tcl${TCL_LIBRARY_VERSION} 1355 /usr/include/tcl8.6 1356 diff -ru cmake-2.6.2.org//Modules/FindTclStub.cmake cmake-2.6.2/Modules/FindTclStub.cmake 1357 --- cmake-2.6.2.org//Modules/FindTclStub.cmake Wed Sep 24 11:34:34 2008 1358 +++ cmake-2.6.2/Modules/FindTclStub.cmake Thu May 21 16:21:07 2009 1359 @@ -53,7 +53,8 @@ 1360 "${TCL_TCLSH_PATH_PARENT}/lib" 1361 "${TK_WISH_PATH_PARENT}/lib" 1362 /usr/lib 1363 - /usr/local/lib 1364 +# Uncomment the following to enable /usr/local search 1365 +# /usr/local/lib 1366 ) 1367 1368 IF(WIN32) 1369 diff -ru cmake-2.6.2.org//Modules/FindUnixCommands.cmake cmake-2.6.2/Modules/FindUnixCommands.cmake 1370 --- cmake-2.6.2.org//Modules/FindUnixCommands.cmake Wed Sep 24 11:34:34 2008 1371 +++ cmake-2.6.2/Modules/FindUnixCommands.cmake Thu May 21 16:21:07 2009 1372 @@ -9,7 +9,8 @@ 1373 ${CYGWIN_INSTALL_PATH}/bin 1374 /bin 1375 /usr/bin 1376 - /usr/local/bin 1377 +# Uncomment the following to enable /usr/local search 1378 +# /usr/local/bin 1379 /sbin 1380 ) 1381 MARK_AS_ADVANCED( 1382 @@ -21,7 +22,8 @@ 1383 ${CYGWIN_INSTALL_PATH}/bin 1384 /bin 1385 /usr/bin 1386 - /usr/local/bin 1387 +# Uncomment the following to enable /usr/local search 1388 +# /usr/local/bin 1389 /sbin 1390 ) 1391 MARK_AS_ADVANCED( 1392 @@ -33,7 +35,8 @@ 1393 ${CYGWIN_INSTALL_PATH}/bin 1394 /bin 1395 /usr/bin 1396 - /usr/local/bin 1397 +# Uncomment the following to enable /usr/local search 1398 +# /usr/local/bin 1399 /sbin 1400 ) 1401 MARK_AS_ADVANCED( 1402 @@ -45,7 +48,8 @@ 1403 ${CYGWIN_INSTALL_PATH}/bin 1404 /bin 1405 /usr/bin 1406 - /usr/local/bin 1407 +# Uncomment the following to enable /usr/local search 1408 +# /usr/local/bin 1409 /sbin 1410 ) 1411 MARK_AS_ADVANCED( 1412 @@ -57,7 +61,8 @@ 1413 ${CYGWIN_INSTALL_PATH}/bin 1414 /bin 1415 /usr/bin 1416 - /usr/local/bin 1417 +# Uncomment the following to enable /usr/local search 1418 +# /usr/local/bin 1419 /sbin 1420 ) 1421 MARK_AS_ADVANCED( 1422 @@ -72,7 +77,8 @@ 1423 ${CYGWIN_INSTALL_PATH}/bin 1424 /bin 1425 /usr/bin 1426 - /usr/local/bin 1427 +# Uncomment the following to enable /usr/local search 1428 +# /usr/local/bin 1429 /sbin 1430 ) 1431 MARK_AS_ADVANCED( 1432 diff -ru cmake-2.6.2.org//Modules/FindVTK.cmake cmake-2.6.2/Modules/FindVTK.cmake 1433 --- cmake-2.6.2.org//Modules/FindVTK.cmake Wed Sep 24 11:34:34 2008 1434 +++ cmake-2.6.2/Modules/FindVTK.cmake Thu May 21 16:21:07 2009 1435 @@ -77,7 +77,8 @@ 1436 ${VTK_DIR_SEARCH} 1437 1438 # Look in standard UNIX install locations. 1439 - /usr/local/lib/vtk 1440 +# Uncomment the following to enable /usr/local search 1441 +# /usr/local/lib/vtk 1442 /usr/lib/vtk 1443 1444 # Read from the CMakeSetup registry entries. It is likely that 1445 diff -ru cmake-2.6.2.org//Modules/Findosg.cmake cmake-2.6.2/Modules/Findosg.cmake 1446 --- cmake-2.6.2.org//Modules/Findosg.cmake Wed Sep 24 11:34:34 2008 1447 +++ cmake-2.6.2/Modules/Findosg.cmake Thu May 21 16:21:07 2009 1448 @@ -34,11 +34,13 @@ 1449 PATHS 1450 ~/Library/Frameworks 1451 /Library/Frameworks 1452 - /usr/local 1453 +# Uncomment the following to enable /usr/local search 1454 +# /usr/local 1455 /usr 1456 /sw # Fink 1457 /opt/local # DarwinPorts 1458 - /opt/csw # Blastwave 1459 +# Uncomment the following to enable /opt/csw search 1460 +# /opt/csw # Blastwave 1461 /opt 1462 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1463 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1464 @@ -49,15 +51,17 @@ 1465 HINTS 1466 $ENV{OSG_DIR} 1467 $ENV{OSGDIR} 1468 - PATH_SUFFIXES lib64 lib 1469 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1470 PATHS 1471 ~/Library/Frameworks 1472 /Library/Frameworks 1473 - /usr/local 1474 +# Uncomment the following to enable /usr/local search 1475 +# /usr/local 1476 /usr 1477 /sw 1478 /opt/local 1479 - /opt/csw 1480 +# Uncomment the following to enable /opt/csw search 1481 +# /opt/csw 1482 /opt 1483 ) 1484 1485 diff -ru cmake-2.6.2.org//Modules/FindosgDB.cmake cmake-2.6.2/Modules/FindosgDB.cmake 1486 --- cmake-2.6.2.org//Modules/FindosgDB.cmake Wed Sep 24 11:34:34 2008 1487 +++ cmake-2.6.2/Modules/FindosgDB.cmake Thu May 21 16:21:07 2009 1488 @@ -35,11 +35,13 @@ 1489 PATHS 1490 ~/Library/Frameworks 1491 /Library/Frameworks 1492 - /usr/local 1493 +# Uncomment the following to enable /usr/local search 1494 +# /usr/local 1495 /usr 1496 /sw # Fink 1497 /opt/local # DarwinPorts 1498 - /opt/csw # Blastwave 1499 +# Uncomment the following to enable /opt/csw search 1500 +# /opt/csw # Blastwave 1501 /opt 1502 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1503 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1504 @@ -51,15 +53,17 @@ 1505 $ENV{OSGDB_DIR} 1506 $ENV{OSG_DIR} 1507 $ENV{OSGDIR} 1508 - PATH_SUFFIXES lib64 lib 1509 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1510 PATHS 1511 ~/Library/Frameworks 1512 /Library/Frameworks 1513 - /usr/local 1514 +# Uncomment the following to enable /usr/local search 1515 +# /usr/local 1516 /usr 1517 /sw 1518 /opt/local 1519 - /opt/csw 1520 +# Uncomment the following to enable /opt/csw search 1521 +# /opt/csw 1522 /opt 1523 ) 1524 1525 diff -ru cmake-2.6.2.org//Modules/FindosgFX.cmake cmake-2.6.2/Modules/FindosgFX.cmake 1526 --- cmake-2.6.2.org//Modules/FindosgFX.cmake Wed Sep 24 11:34:34 2008 1527 +++ cmake-2.6.2/Modules/FindosgFX.cmake Thu May 21 16:21:07 2009 1528 @@ -35,11 +35,13 @@ 1529 PATHS 1530 ~/Library/Frameworks 1531 /Library/Frameworks 1532 - /usr/local 1533 +# Uncomment the following to enable /usr/local search 1534 +# /usr/local 1535 /usr 1536 /sw # Fink 1537 /opt/local # DarwinPorts 1538 - /opt/csw # Blastwave 1539 +# Uncomment the following to enable /opt/csw search 1540 +# /opt/csw # Blastwave 1541 /opt 1542 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1543 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1544 @@ -51,15 +53,17 @@ 1545 $ENV{OSGFX_DIR} 1546 $ENV{OSG_DIR} 1547 $ENV{OSGDIR} 1548 - PATH_SUFFIXES lib64 lib 1549 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1550 PATHS 1551 ~/Library/Frameworks 1552 /Library/Frameworks 1553 - /usr/local 1554 +# Uncomment the following to enable /usr/local search 1555 +# /usr/local 1556 /usr 1557 /sw 1558 /opt/local 1559 - /opt/csw 1560 +# Uncomment the following to enable /opt/csw search 1561 +# /opt/csw 1562 /opt 1563 ) 1564 1565 diff -ru cmake-2.6.2.org//Modules/FindosgGA.cmake cmake-2.6.2/Modules/FindosgGA.cmake 1566 --- cmake-2.6.2.org//Modules/FindosgGA.cmake Wed Sep 24 11:34:34 2008 1567 +++ cmake-2.6.2/Modules/FindosgGA.cmake Thu May 21 16:21:07 2009 1568 @@ -35,11 +35,13 @@ 1569 PATHS 1570 ~/Library/Frameworks 1571 /Library/Frameworks 1572 - /usr/local 1573 +# Uncomment the following to enable /usr/local search 1574 +# /usr/local 1575 /usr 1576 /sw # Fink 1577 /opt/local # DarwinPorts 1578 - /opt/csw # Blastwave 1579 +# Uncomment the following to enable /opt/csw search 1580 +# /opt/csw # Blastwave 1581 /opt 1582 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1583 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1584 @@ -51,15 +53,17 @@ 1585 $ENV{OSGGA_DIR} 1586 $ENV{OSG_DIR} 1587 $ENV{OSGDIR} 1588 - PATH_SUFFIXES lib64 lib 1589 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1590 PATHS 1591 ~/Library/Frameworks 1592 /Library/Frameworks 1593 - /usr/local 1594 +# Uncomment the following to enable /usr/local search 1595 +# /usr/local 1596 /usr 1597 /sw 1598 /opt/local 1599 - /opt/csw 1600 +# Uncomment the following to enable /opt/csw search 1601 +# /opt/csw 1602 /opt 1603 ) 1604 1605 diff -ru cmake-2.6.2.org//Modules/FindosgIntrospection.cmake cmake-2.6.2/Modules/FindosgIntrospection.cmake 1606 --- cmake-2.6.2.org//Modules/FindosgIntrospection.cmake Wed Sep 24 11:34:34 2008 1607 +++ cmake-2.6.2/Modules/FindosgIntrospection.cmake Thu May 21 16:21:08 2009 1608 @@ -35,11 +35,13 @@ 1609 PATHS 1610 ~/Library/Frameworks 1611 /Library/Frameworks 1612 - /usr/local 1613 +# Uncomment the following to enable /usr/local search 1614 +# /usr/local 1615 /usr 1616 /sw # Fink 1617 /opt/local # DarwinPorts 1618 - /opt/csw # Blastwave 1619 +# Uncomment the following to enable /opt/csw search 1620 +# /opt/csw # Blastwave 1621 /opt 1622 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1623 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1624 @@ -51,15 +53,17 @@ 1625 $ENV{OSGINTROSPECTION_DIR} 1626 $ENV{OSG_DIR} 1627 $ENV{OSGDIR} 1628 - PATH_SUFFIXES lib64 lib 1629 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1630 PATHS 1631 ~/Library/Frameworks 1632 /Library/Frameworks 1633 - /usr/local 1634 +# Uncomment the following to enable /usr/local search 1635 +# /usr/local 1636 /usr 1637 /sw 1638 /opt/local 1639 - /opt/csw 1640 +# Uncomment the following to enable /opt/csw search 1641 +# /opt/csw 1642 /opt 1643 ) 1644 1645 diff -ru cmake-2.6.2.org//Modules/FindosgManipulator.cmake cmake-2.6.2/Modules/FindosgManipulator.cmake 1646 --- cmake-2.6.2.org//Modules/FindosgManipulator.cmake Wed Sep 24 11:34:34 2008 1647 +++ cmake-2.6.2/Modules/FindosgManipulator.cmake Thu May 21 16:21:08 2009 1648 @@ -35,11 +35,13 @@ 1649 PATHS 1650 ~/Library/Frameworks 1651 /Library/Frameworks 1652 - /usr/local 1653 +# Uncomment the following to enable /usr/local search 1654 +# /usr/local 1655 /usr 1656 /sw # Fink 1657 /opt/local # DarwinPorts 1658 - /opt/csw # Blastwave 1659 +# Uncomment the following to enable /opt/csw search 1660 +# /opt/csw # Blastwave 1661 /opt 1662 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1663 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1664 @@ -51,15 +53,17 @@ 1665 $ENV{OSGMANIPULATOR_DIR} 1666 $ENV{OSG_DIR} 1667 $ENV{OSGDIR} 1668 - PATH_SUFFIXES lib64 lib 1669 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1670 PATHS 1671 ~/Library/Frameworks 1672 /Library/Frameworks 1673 - /usr/local 1674 +# Uncomment the following to enable /usr/local search 1675 +# /usr/local 1676 /usr 1677 /sw 1678 /opt/local 1679 - /opt/csw 1680 +# Uncomment the following to enable /opt/csw search 1681 +# /opt/csw 1682 /opt 1683 ) 1684 1685 diff -ru cmake-2.6.2.org//Modules/FindosgParticle.cmake cmake-2.6.2/Modules/FindosgParticle.cmake 1686 --- cmake-2.6.2.org//Modules/FindosgParticle.cmake Wed Sep 24 11:34:34 2008 1687 +++ cmake-2.6.2/Modules/FindosgParticle.cmake Thu May 21 16:21:08 2009 1688 @@ -35,11 +35,13 @@ 1689 PATHS 1690 ~/Library/Frameworks 1691 /Library/Frameworks 1692 - /usr/local 1693 +# Uncomment the following to enable /usr/local search 1694 +# /usr/local 1695 /usr 1696 /sw # Fink 1697 /opt/local # DarwinPorts 1698 - /opt/csw # Blastwave 1699 +# Uncomment the following to enable /opt/csw search 1700 +# /opt/csw # Blastwave 1701 /opt 1702 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1703 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1704 @@ -51,15 +53,17 @@ 1705 $ENV{OSGPARTICLE_DIR} 1706 $ENV{OSG_DIR} 1707 $ENV{OSGDIR} 1708 - PATH_SUFFIXES lib64 lib 1709 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1710 PATHS 1711 ~/Library/Frameworks 1712 /Library/Frameworks 1713 - /usr/local 1714 +# Uncomment the following to enable /usr/local search 1715 +# /usr/local 1716 /usr 1717 /sw 1718 /opt/local 1719 - /opt/csw 1720 +# Uncomment the following to enable /opt/csw search 1721 +# /opt/csw 1722 /opt 1723 ) 1724 1725 diff -ru cmake-2.6.2.org//Modules/FindosgProducer.cmake cmake-2.6.2/Modules/FindosgProducer.cmake 1726 --- cmake-2.6.2.org//Modules/FindosgProducer.cmake Wed Sep 24 11:34:34 2008 1727 +++ cmake-2.6.2/Modules/FindosgProducer.cmake Thu May 21 16:21:08 2009 1728 @@ -35,11 +35,13 @@ 1729 PATHS 1730 ~/Library/Frameworks 1731 /Library/Frameworks 1732 - /usr/local 1733 +# Uncomment the following to enable /usr/local search 1734 +# /usr/local 1735 /usr 1736 /sw # Fink 1737 /opt/local # DarwinPorts 1738 - /opt/csw # Blastwave 1739 +# Uncomment the following to enable /opt/csw search 1740 +# /opt/csw # Blastwave 1741 /opt 1742 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1743 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1744 @@ -51,15 +53,17 @@ 1745 $ENV{OSGPRODUCER_DIR} 1746 $ENV{OSG_DIR} 1747 $ENV{OSGDIR} 1748 - PATH_SUFFIXES lib64 lib 1749 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1750 PATHS 1751 ~/Library/Frameworks 1752 /Library/Frameworks 1753 - /usr/local 1754 +# Uncomment the following to enable /usr/local search 1755 +# /usr/local 1756 /usr 1757 /sw 1758 /opt/local 1759 - /opt/csw 1760 +# Uncomment the following to enable /opt/csw search 1761 +# /opt/csw 1762 /opt 1763 ) 1764 1765 diff -ru cmake-2.6.2.org//Modules/FindosgShadow.cmake cmake-2.6.2/Modules/FindosgShadow.cmake 1766 --- cmake-2.6.2.org//Modules/FindosgShadow.cmake Wed Sep 24 11:34:34 2008 1767 +++ cmake-2.6.2/Modules/FindosgShadow.cmake Thu May 21 16:21:08 2009 1768 @@ -35,11 +35,13 @@ 1769 PATHS 1770 ~/Library/Frameworks 1771 /Library/Frameworks 1772 - /usr/local 1773 +# Uncomment the following to enable /usr/local search 1774 +# /usr/local 1775 /usr 1776 /sw # Fink 1777 /opt/local # DarwinPorts 1778 - /opt/csw # Blastwave 1779 +# Uncomment the following to enable /opt/csw search 1780 +# /opt/csw # Blastwave 1781 /opt 1782 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1783 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1784 @@ -51,15 +53,17 @@ 1785 $ENV{OSGSHADOW_DIR} 1786 $ENV{OSG_DIR} 1787 $ENV{OSGDIR} 1788 - PATH_SUFFIXES lib64 lib 1789 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1790 PATHS 1791 ~/Library/Frameworks 1792 /Library/Frameworks 1793 - /usr/local 1794 +# Uncomment the following to enable /usr/local search 1795 +# /usr/local 1796 /usr 1797 /sw 1798 /opt/local 1799 - /opt/csw 1800 +# Uncomment the following to enable /opt/csw search 1801 +# /opt/csw 1802 /opt 1803 ) 1804 1805 diff -ru cmake-2.6.2.org//Modules/FindosgSim.cmake cmake-2.6.2/Modules/FindosgSim.cmake 1806 --- cmake-2.6.2.org//Modules/FindosgSim.cmake Wed Sep 24 11:34:34 2008 1807 +++ cmake-2.6.2/Modules/FindosgSim.cmake Thu May 21 16:21:08 2009 1808 @@ -35,11 +35,13 @@ 1809 PATHS 1810 ~/Library/Frameworks 1811 /Library/Frameworks 1812 - /usr/local 1813 +# Uncomment the following to enable /usr/local search 1814 +# /usr/local 1815 /usr 1816 /sw # Fink 1817 /opt/local # DarwinPorts 1818 - /opt/csw # Blastwave 1819 +# Uncomment the following to enable /opt/csw search 1820 +# /opt/csw # Blastwave 1821 /opt 1822 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1823 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1824 @@ -51,15 +53,17 @@ 1825 $ENV{OSGSIM_DIR} 1826 $ENV{OSG_DIR} 1827 $ENV{OSGDIR} 1828 - PATH_SUFFIXES lib64 lib 1829 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1830 PATHS 1831 ~/Library/Frameworks 1832 /Library/Frameworks 1833 - /usr/local 1834 +# Uncomment the following to enable /usr/local search 1835 +# /usr/local 1836 /usr 1837 /sw 1838 /opt/local 1839 - /opt/csw 1840 +# Uncomment the following to enable /opt/csw search 1841 +# /opt/csw 1842 /opt 1843 ) 1844 1845 diff -ru cmake-2.6.2.org//Modules/FindosgTerrain.cmake cmake-2.6.2/Modules/FindosgTerrain.cmake 1846 --- cmake-2.6.2.org//Modules/FindosgTerrain.cmake Wed Sep 24 11:34:34 2008 1847 +++ cmake-2.6.2/Modules/FindosgTerrain.cmake Thu May 21 16:21:08 2009 1848 @@ -35,11 +35,13 @@ 1849 PATHS 1850 ~/Library/Frameworks 1851 /Library/Frameworks 1852 - /usr/local 1853 +# Uncomment the following to enable /usr/local search 1854 +# /usr/local 1855 /usr 1856 /sw # Fink 1857 /opt/local # DarwinPorts 1858 - /opt/csw # Blastwave 1859 +# Uncomment the following to enable /opt/csw search 1860 +# /opt/csw # Blastwave 1861 /opt 1862 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1863 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1864 @@ -51,15 +53,17 @@ 1865 $ENV{OSGTERRAIN_DIR} 1866 $ENV{OSG_DIR} 1867 $ENV{OSGDIR} 1868 - PATH_SUFFIXES lib64 lib 1869 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1870 PATHS 1871 ~/Library/Frameworks 1872 /Library/Frameworks 1873 - /usr/local 1874 +# Uncomment the following to enable /usr/local search 1875 +# /usr/local 1876 /usr 1877 /sw 1878 /opt/local 1879 - /opt/csw 1880 +# Uncomment the following to enable /opt/csw search 1881 +# /opt/csw 1882 /opt 1883 ) 1884 1885 diff -ru cmake-2.6.2.org//Modules/FindosgText.cmake cmake-2.6.2/Modules/FindosgText.cmake 1886 --- cmake-2.6.2.org//Modules/FindosgText.cmake Wed Sep 24 11:34:34 2008 1887 +++ cmake-2.6.2/Modules/FindosgText.cmake Thu May 21 16:21:08 2009 1888 @@ -35,11 +35,13 @@ 1889 PATHS 1890 ~/Library/Frameworks 1891 /Library/Frameworks 1892 - /usr/local 1893 +# Uncomment the following to enable /usr/local search 1894 +# /usr/local 1895 /usr 1896 /sw # Fink 1897 /opt/local # DarwinPorts 1898 - /opt/csw # Blastwave 1899 +# Uncomment the following to enable /opt/csw search 1900 +# /opt/csw # Blastwave 1901 /opt 1902 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1903 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1904 @@ -51,15 +53,17 @@ 1905 $ENV{OSGTEXT_DIR} 1906 $ENV{OSG_DIR} 1907 $ENV{OSGDIR} 1908 - PATH_SUFFIXES lib64 lib 1909 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1910 PATHS 1911 ~/Library/Frameworks 1912 /Library/Frameworks 1913 - /usr/local 1914 +# Uncomment the following to enable /usr/local search 1915 +# /usr/local 1916 /usr 1917 /sw 1918 /opt/local 1919 - /opt/csw 1920 +# Uncomment the following to enable /opt/csw search 1921 +# /opt/csw 1922 /opt 1923 ) 1924 1925 diff -ru cmake-2.6.2.org//Modules/FindosgUtil.cmake cmake-2.6.2/Modules/FindosgUtil.cmake 1926 --- cmake-2.6.2.org//Modules/FindosgUtil.cmake Wed Sep 24 11:34:34 2008 1927 +++ cmake-2.6.2/Modules/FindosgUtil.cmake Thu May 21 16:21:08 2009 1928 @@ -35,11 +35,13 @@ 1929 PATHS 1930 ~/Library/Frameworks 1931 /Library/Frameworks 1932 - /usr/local 1933 +# Uncomment the following to enable /usr/local search 1934 +# /usr/local 1935 /usr 1936 /sw # Fink 1937 /opt/local # DarwinPorts 1938 - /opt/csw # Blastwave 1939 +# Uncomment the following to enable /opt/csw search 1940 +# /opt/csw # Blastwave 1941 /opt 1942 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1943 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1944 @@ -51,15 +53,17 @@ 1945 $ENV{OSGUTIL_DIR} 1946 $ENV{OSG_DIR} 1947 $ENV{OSGDIR} 1948 - PATH_SUFFIXES lib64 lib 1949 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1950 PATHS 1951 ~/Library/Frameworks 1952 /Library/Frameworks 1953 - /usr/local 1954 +# Uncomment the following to enable /usr/local search 1955 +# /usr/local 1956 /usr 1957 /sw 1958 /opt/local 1959 - /opt/csw 1960 +# Uncomment the following to enable /opt/csw search 1961 +# /opt/csw 1962 /opt 1963 ) 1964 1965 diff -ru cmake-2.6.2.org//Modules/FindosgViewer.cmake cmake-2.6.2/Modules/FindosgViewer.cmake 1966 --- cmake-2.6.2.org//Modules/FindosgViewer.cmake Wed Sep 24 11:34:34 2008 1967 +++ cmake-2.6.2/Modules/FindosgViewer.cmake Thu May 21 16:21:08 2009 1968 @@ -35,11 +35,13 @@ 1969 PATHS 1970 ~/Library/Frameworks 1971 /Library/Frameworks 1972 - /usr/local 1973 +# Uncomment the following to enable /usr/local search 1974 +# /usr/local 1975 /usr 1976 /sw # Fink 1977 /opt/local # DarwinPorts 1978 - /opt/csw # Blastwave 1979 +# Uncomment the following to enable /opt/csw search 1980 +# /opt/csw # Blastwave 1981 /opt 1982 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1983 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1984 @@ -51,15 +53,17 @@ 1985 $ENV{OSGVIEWER_DIR} 1986 $ENV{OSG_DIR} 1987 $ENV{OSGDIR} 1988 - PATH_SUFFIXES lib64 lib 1989 + PATH_SUFFIXES lib64 lib lib/32 lib/64 1990 PATHS 1991 ~/Library/Frameworks 1992 /Library/Frameworks 1993 - /usr/local 1994 +# Uncomment the following to enable /usr/local search 1995 +# /usr/local 1996 /usr 1997 /sw 1998 /opt/local 1999 - /opt/csw 2000 +# Uncomment the following to enable /opt/csw search 2001 +# /opt/csw 2002 /opt 2003 ) 2004 2005 diff -ru cmake-2.6.2.org//Modules/GetPrerequisites.cmake cmake-2.6.2/Modules/GetPrerequisites.cmake 2006 --- cmake-2.6.2.org//Modules/GetPrerequisites.cmake Wed Sep 24 11:34:34 2008 2007 +++ cmake-2.6.2/Modules/GetPrerequisites.cmake Thu May 21 16:21:08 2009 2008 @@ -440,7 +440,8 @@ 2009 "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN" 2010 "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" 2011 "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" 2012 - "/usr/local/bin" 2013 +# Uncomment the following to enable /usr/local search 2014 +# "/usr/local/bin" 2015 "/usr/bin" 2016 ) 2017 2018 diff -ru cmake-2.6.2.org//Source/cmDocumentation.cxx cmake-2.6.2/Source/cmDocumentation.cxx 2019 --- cmake-2.6.2.org//Source/cmDocumentation.cxx Wed Apr 15 20:35:21 2009 2020 +++ cmake-2.6.2/Source/cmDocumentation.cxx Thu May 21 16:14:19 2009 2021 @@ -1222,6 +1222,7 @@ 2022 bool cmDocumentation::PrintDocumentationUsage(std::ostream& os) 2023 { 2024 this->ClearSections(); 2025 + this->AddSectionToPrint("Name"); 2026 this->AddSectionToPrint("Usage"); 2027 this->AddSectionToPrint("Options"); 2028 this->AddSectionToPrint("Generators"); 2029 @@ -1244,6 +1245,7 @@ 2030 { 2031 this->ClearSections(); 2032 this->CreateModulesSection(); 2033 + this->AddSectionToPrint("Name"); 2034 this->AddSectionToPrint("Description"); 2035 this->AddSectionToPrint("Modules"); 2036 this->AddSectionToPrint("Copyright"); 2037 @@ -1259,6 +1261,7 @@ 2038 { 2039 this->ClearSections(); 2040 this->CreateCustomModulesSection(); 2041 + this->AddSectionToPrint("Name"); 2042 this->AddSectionToPrint("Description"); 2043 this->AddSectionToPrint("Custom CMake Modules"); 2044 // the custom modules are most probably not under Kitware's copyright, Alex 2045 @@ -1275,6 +1278,7 @@ 2046 bool cmDocumentation::PrintDocumentationPolicies(std::ostream& os) 2047 { 2048 this->ClearSections(); 2049 + this->AddSectionToPrint("Name"); 2050 this->AddSectionToPrint("Description"); 2051 this->AddSectionToPrint("Policies"); 2052 this->AddSectionToPrint("Copyright"); 2053 @@ -1290,6 +1294,7 @@ 2054 bool cmDocumentation::PrintDocumentationProperties(std::ostream& os) 2055 { 2056 this->ClearSections(); 2057 + this->AddSectionToPrint("Name"); 2058 this->AddSectionToPrint("Properties Description"); 2059 for (std::vector<std::string>::iterator i = 2060 this->PropertySections.begin(); 2061 @@ -1309,6 +1314,7 @@ 2062 bool cmDocumentation::PrintDocumentationVariables(std::ostream& os) 2063 { 2064 this->ClearSections(); 2065 + this->AddSectionToPrint("Name"); 2066 for (std::vector<std::string>::iterator i = 2067 this->VariableSections.begin(); 2068 i != this->VariableSections.end(); ++i) 2069 @@ -1327,6 +1333,7 @@ 2070 bool cmDocumentation::PrintDocumentationCurrentCommands(std::ostream& os) 2071 { 2072 this->ClearSections(); 2073 + this->AddSectionToPrint("Name"); 2074 this->AddSectionToPrint("Commands"); 2075 this->AddSectionToPrint("Copyright"); 2076 this->AddSectionToPrint("Standard See Also"); 2077 @@ -1340,6 +1347,7 @@ 2078 bool cmDocumentation::PrintDocumentationCompatCommands(std::ostream& os) 2079 { 2080 this->ClearSections(); 2081 + this->AddSectionToPrint("Name"); 2082 this->AddSectionToPrint("Compatibility Commands Description"); 2083 this->AddSectionToPrint("Compatibility Commands"); 2084 this->AddSectionToPrint("Copyright"); 2085 diff -ru cmake-2.6.2.org//Source/cmGlobalGenerator.cxx cmake-2.6.2/Source/cmGlobalGenerator.cxx 2086 --- cmake-2.6.2.org//Source/cmGlobalGenerator.cxx Wed Sep 24 11:34:36 2008 2087 +++ cmake-2.6.2/Source/cmGlobalGenerator.cxx Thu May 21 16:21:08 2009 2088 @@ -1765,6 +1765,8 @@ 2089 cfgArg += mf->GetDefinition("CMAKE_CFG_INTDIR"); 2090 singleLine.push_back(cfgArg); 2091 } 2092 + singleLine.push_back("-D"); 2093 + singleLine.push_back("CMAKE_INSTALL_PREFIX=./sfw_stage/"); 2094 singleLine.push_back("-P"); 2095 singleLine.push_back("cmake_install.cmake"); 2096 cpackCommandLines.push_back(singleLine); 2097
Indexes created Wed Nov 25 06:54:36 UTC 2009
Terms of Use |
Privacy |
Trademarks |
Copyright Policy |
Site Guidelines |
Help
Your use of this web site or any of its content or software indicates your agreement to be bound by these Terms of Use.
Copyright © 1995-2008 Sun Microsystems, Inc.