components/cmake/patches/cmake-2.8.6.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 614 db6c0cd206dd
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
614
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     1
diff -ru cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     2
--- cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     3
+++ cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake	Mon Oct 10 13:44:03 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     4
@@ -55,9 +55,10 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     5
     /usr/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     6
     /usr/lib/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     7
     /usr/share/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     8
-    /usr/local/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
     9
-    /usr/local/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    10
-    /usr/local/java/share/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    11
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    12
+#    /usr/local/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    13
+#    /usr/local/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    14
+#    /usr/local/java/share/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    15
     /usr/java/j2sdk1.4.2_04
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    16
     /usr/lib/j2sdk1.4-sun/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    17
     /usr/java/j2sdk1.4.2_09/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    18
diff -ru cmake-2.8.6.org//Modules/CMakeDetermineSystem.cmake cmake-2.8.6/Modules/CMakeDetermineSystem.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    19
--- cmake-2.8.6.org//Modules/CMakeDetermineSystem.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    20
+++ cmake-2.8.6/Modules/CMakeDetermineSystem.cmake	Mon Oct 10 13:47:49 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    21
@@ -43,7 +43,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    22
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    23
 # find out on which system cmake runs
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    24
 IF(CMAKE_HOST_UNIX)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    25
-  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    26
+FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    27
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    28
+#  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    29
   IF(CMAKE_UNAME)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    30
     EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    31
     EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    32
diff -ru cmake-2.8.6.org//Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    33
--- cmake-2.8.6.org//Modules/FindBLAS.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    34
+++ cmake-2.8.6/Modules/FindBLAS.cmake	Mon Oct 10 16:55:05 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    35
@@ -80,9 +80,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    36
   if (WIN32)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    37
     set(_libdir ENV LIB)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    38
   elseif (APPLE)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    39
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    40
+    set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    41
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    42
+#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    43
   else ()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    44
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    45
+    set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    46
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    47
+#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    48
   endif ()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    49
 endif ()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    50
 foreach(_library ${_list})
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    51
diff -ru cmake-2.8.6.org//Modules/FindFLTK.cmake cmake-2.8.6/Modules/FindFLTK.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    52
--- cmake-2.8.6.org//Modules/FindFLTK.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    53
+++ cmake-2.8.6/Modules/FindFLTK.cmake	Tue Oct 11 11:54:22 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    54
@@ -103,11 +103,15 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    55
     ${FLTK_DIR_SEARCH}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    56
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    57
     # Look in standard UNIX install locations.
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    58
-    /usr/local/lib/fltk
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    59
+
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    60
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    61
+#    /usr/local/lib/fltk
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    62
     /usr/lib/fltk
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    63
-    /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    64
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    65
+#    /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    66
     /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    67
-    /usr/local/fltk
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    68
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    69
+#    /usr/local/fltk
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    70
     /usr/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    71
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    72
     # Read from the CMakeSetup registry entries.  It is likely that
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    73
@@ -221,7 +225,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    74
     ENDIF()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    75
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    76
     SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    77
-      /usr/local/fltk
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    78
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    79
+#      /usr/local/fltk
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    80
       /usr/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    81
       ${_FLTK_POSSIBLE_INCLUDE_DIRS}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    82
       )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    83
@@ -242,7 +247,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    84
     ENDIF()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    85
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    86
     SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    87
-      /usr/local/fltk/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    88
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    89
+#      /usr/local/fltk/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    90
       /usr/X11R6/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    91
       ${FLTK_INCLUDE_DIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    92
       ${_FLTK_POSSIBLE_LIBRARY_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    93
diff -ru cmake-2.8.6.org//Modules/FindFLTK2.cmake cmake-2.8.6/Modules/FindFLTK2.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    94
--- cmake-2.8.6.org//Modules/FindFLTK2.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    95
+++ cmake-2.8.6/Modules/FindFLTK2.cmake	Mon Oct 10 16:48:15 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    96
@@ -83,11 +83,15 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    97
     ${FLTK2_DIR_SEARCH}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    98
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
    99
     # Look in standard UNIX install locations.
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   100
-    /usr/local/lib/fltk2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   101
+
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   102
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   103
+#    /usr/local/lib/fltk2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   104
     /usr/lib/fltk2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   105
-    /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   106
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   107
+#    /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   108
     /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   109
-    /usr/local/fltk2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   110
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   111
+#    /usr/local/fltk2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   112
     /usr/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   113
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   114
     # Read from the CMakeSetup registry entries.  It is likely that
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   115
@@ -193,9 +197,11 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   116
     ENDIF(FLTK2_FLUID_EXECUTABLE)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   117
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   118
     SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   119
-      /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   120
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   121
+#      /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   122
       /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   123
-      /usr/local/fltk2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   124
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   125
+#      /usr/local/fltk2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   126
       /usr/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   127
       )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   128
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   129
@@ -203,8 +209,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   130
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   131
     SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   132
       /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   133
-      /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   134
-      /usr/local/fltk2/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   135
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   136
+#      /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   137
+#      /usr/local/fltk2/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   138
       /usr/X11R6/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   139
       ${FLTK2_INCLUDE_DIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   140
       )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   141
diff -ru cmake-2.8.6.org//Modules/FindFreetype.cmake cmake-2.8.6/Modules/FindFreetype.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   142
--- cmake-2.8.6.org//Modules/FindFreetype.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   143
+++ cmake-2.8.6/Modules/FindFreetype.cmake	Mon Oct 10 16:50:47 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   144
@@ -45,8 +45,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   145
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   146
   $ENV{FREETYPE_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   147
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   148
-  /usr/local/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   149
-  /usr/local/X11/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   150
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   151
+#  /usr/local/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   152
+#  /usr/local/X11/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   153
   /usr/freeware/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   154
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   155
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   156
@@ -54,8 +55,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   157
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   158
   $ENV{FREETYPE_DIR}/include/freetype2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   159
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   160
-  /usr/local/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   161
-  /usr/local/X11/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   162
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   163
+#  /usr/local/X11R6/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   164
+#  /usr/local/X11/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   165
   /usr/freeware/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   166
   PATH_SUFFIXES freetype2
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   167
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   168
@@ -66,8 +68,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   169
   $ENV{FREETYPE_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   170
   PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   171
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   172
-  /usr/local/X11R6
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   173
-  /usr/local/X11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   174
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   175
+#  /usr/local/X11R6
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   176
+#  /usr/local/X11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   177
   /usr/freeware
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   178
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   179
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   180
diff -ru cmake-2.8.6.org//Modules/FindGDAL.cmake cmake-2.8.6/Modules/FindGDAL.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   181
--- cmake-2.8.6.org//Modules/FindGDAL.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   182
+++ cmake-2.8.6/Modules/FindGDAL.cmake	Mon Oct 10 16:52:52 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   183
@@ -53,7 +53,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   184
       /Library/Frameworks/gdal.framework/Headers
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   185
       /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   186
       /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   187
-      /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   188
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   189
+#      /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   190
       /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   191
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   192
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   193
@@ -70,7 +71,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   194
         PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   195
             /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   196
             /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   197
-            /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   198
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   199
+#            /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   200
             /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   201
     )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   202
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   203
@@ -95,7 +97,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   204
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   205
     /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   206
     /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   207
-    /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   208
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   209
+#    /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   210
     /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   211
     /usr/freeware
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   212
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   213
diff -ru cmake-2.8.6.org//Modules/FindGTK.cmake cmake-2.8.6/Modules/FindGTK.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   214
--- cmake-2.8.6.org//Modules/FindGTK.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   215
+++ cmake-2.8.6/Modules/FindGTK.cmake	Mon Oct 10 16:53:18 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   216
@@ -36,9 +36,11 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   217
   FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   218
     PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   219
     /usr/openwin/share/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   220
-    /usr/local/include/glib12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   221
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   222
+#    /usr/local/include/glib12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   223
     /usr/lib/glib/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   224
-    /usr/local/lib/glib/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   225
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   226
+#    /usr/local/lib/glib/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   227
     /opt/gnome/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   228
     /opt/gnome/lib/glib/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   229
   )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   230
diff -ru cmake-2.8.6.org//Modules/FindGTK2.cmake cmake-2.8.6/Modules/FindGTK2.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   231
--- cmake-2.8.6.org//Modules/FindGTK2.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   232
+++ cmake-2.8.6/Modules/FindGTK2.cmake	Mon Oct 10 16:53:36 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   233
@@ -185,8 +185,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   234
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   235
     find_path(${_var} ${_hdr}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   236
         PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   237
-            /usr/local/lib64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   238
-            /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   239
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   240
+#            /usr/local/lib64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   241
+#            /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   242
             /usr/lib64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   243
             /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   244
             /opt/gnome/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   245
diff -ru cmake-2.8.6.org//Modules/FindJNI.cmake cmake-2.8.6/Modules/FindJNI.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   246
--- cmake-2.8.6.org//Modules/FindJNI.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   247
+++ cmake-2.8.6/Modules/FindJNI.cmake	Mon Oct 10 16:54:47 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   248
@@ -102,12 +102,14 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   249
   ${_JAVA_HOME}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   250
   ${_JAVA_HOME}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   251
   /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   252
-  /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   253
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   254
+#  /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   255
   /usr/lib/jvm/java/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   256
   /usr/lib/java/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   257
   /usr/lib/jvm/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   258
-  /usr/local/lib/java/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   259
-  /usr/local/share/java/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   260
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   261
+#  /usr/local/lib/java/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   262
+#  /usr/local/share/java/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   263
   /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   264
   /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   265
   /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   266
@@ -139,15 +141,18 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   267
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   268
   ${_JAVA_HOME}/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   269
   /usr/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   270
-  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   271
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   272
+#  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   273
   /usr/lib/java/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   274
-  /usr/local/lib/java/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   275
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   276
+#  /usr/local/lib/java/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   277
   /usr/lib/jvm/java/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   278
   /usr/lib/jvm/java-6-sun/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   279
   /usr/lib/jvm/java-1.5.0-sun/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   280
   /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   281
   /usr/lib/jvm/java-6-openjdk/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   282
-  /usr/local/share/java/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   283
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   284
+#  /usr/local/share/java/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   285
   /usr/lib/j2sdk1.4-sun/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   286
   /usr/lib/j2sdk1.5-sun/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   287
   /opt/sun-jdk-1.5.0.04/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   288
diff -ru cmake-2.8.6.org//Modules/FindJava.cmake cmake-2.8.6/Modules/FindJava.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   289
--- cmake-2.8.6.org//Modules/FindJava.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   290
+++ cmake-2.8.6/Modules/FindJava.cmake	Mon Oct 10 16:54:01 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   291
@@ -73,8 +73,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   292
 SET(_JAVA_PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   293
   /usr/lib/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   294
   /usr/share/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   295
-  /usr/local/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   296
-  /usr/local/java/share/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   297
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   298
+#  /usr/local/java/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   299
+#  /usr/local/java/share/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   300
   /usr/java/j2sdk1.4.2_04
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   301
   /usr/lib/j2sdk1.4-sun/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   302
   /usr/java/j2sdk1.4.2_09/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   303
diff -ru cmake-2.8.6.org//Modules/FindKDE3.cmake cmake-2.8.6/Modules/FindKDE3.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   304
--- cmake-2.8.6.org//Modules/FindKDE3.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   305
+++ cmake-2.8.6/Modules/FindKDE3.cmake	Mon Oct 10 16:55:28 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   306
@@ -141,7 +141,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   307
   /opt/kde3/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   308
   /opt/kde/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   309
   /usr/include/kde
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   310
-  /usr/local/include/kde
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   311
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   312
+#  /usr/local/include/kde
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   313
   )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   314
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   315
 #now the KDE library directory
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   316
diff -ru cmake-2.8.6.org//Modules/FindLAPACK.cmake cmake-2.8.6/Modules/FindLAPACK.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   317
--- cmake-2.8.6.org//Modules/FindLAPACK.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   318
+++ cmake-2.8.6/Modules/FindLAPACK.cmake	Mon Oct 10 16:56:57 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   319
@@ -69,9 +69,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   320
   if (WIN32)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   321
     set(_libdir ENV LIB)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   322
   elseif (APPLE)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   323
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   324
+    set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   325
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   326
+#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   327
   else ()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   328
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   329
+    set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   330
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   331
+#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   332
   endif ()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   333
 endif ()
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   334
 foreach(_library ${_list})
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   335
diff -ru cmake-2.8.6.org//Modules/FindLua50.cmake cmake-2.8.6/Modules/FindLua50.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   336
--- cmake-2.8.6.org//Modules/FindLua50.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   337
+++ cmake-2.8.6/Modules/FindLua50.cmake	Tue Oct 11 11:01:21 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   338
@@ -31,11 +31,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   339
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   340
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   341
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   342
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   343
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   344
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   345
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   346
   /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   347
   /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   348
-  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   349
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   350
+#  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   351
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   352
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   353
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   354
@@ -43,15 +45,17 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   355
   NAMES lua50 lua5.0 lua-5.0 lua5 lua
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   356
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   357
   $ENV{LUA_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   358
-  PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   359
+  PATH_SUFFIXES lib64 lib lib/32 lib/64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   360
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   361
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   362
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   363
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   364
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   365
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   366
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   367
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   368
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   369
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   370
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   371
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   372
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   373
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   374
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   375
@@ -65,13 +69,15 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   376
     HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   377
     $ENV{LUALIB_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   378
     $ENV{LUA_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   379
-    PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   380
+    PATH_SUFFIXES lib64 lib lib/32 lib/64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   381
     PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   382
-    /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   383
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   384
+#    /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   385
     /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   386
     /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   387
     /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   388
-    /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   389
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   390
+#    /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   391
     /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   392
   )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   393
   IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   394
diff -ru cmake-2.8.6.org//Modules/FindLua51.cmake cmake-2.8.6/Modules/FindLua51.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   395
--- cmake-2.8.6.org//Modules/FindLua51.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   396
+++ cmake-2.8.6/Modules/FindLua51.cmake	Tue Oct 11 11:05:48 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   397
@@ -31,11 +31,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   398
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   399
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   400
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   401
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   402
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   403
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   404
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   405
   /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   406
   /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   407
-  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   408
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   409
+#  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   410
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   411
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   412
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   413
@@ -43,15 +45,17 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   414
   NAMES lua51 lua5.1 lua-5.1 lua
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   415
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   416
   $ENV{LUA_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   417
-  PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   418
+  PATH_SUFFIXES lib64 lib lib/32 lib/64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   419
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   420
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   421
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   422
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   423
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   424
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   425
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   426
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   427
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   428
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   429
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   430
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   431
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   432
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   433
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   434
diff -ru cmake-2.8.6.org//Modules/FindMatlab.cmake cmake-2.8.6/Modules/FindMatlab.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   435
--- cmake-2.8.6.org//Modules/FindMatlab.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   436
+++ cmake-2.8.6/Modules/FindMatlab.cmake	Mon Oct 10 17:00:16 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   437
@@ -60,7 +60,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   438
   IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   439
     # Regular x86
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   440
     SET(MATLAB_ROOT
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   441
-      /usr/local/matlab-7sp1/bin/glnx86/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   442
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   443
+#      /usr/local/matlab-7sp1/bin/glnx86/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   444
       /opt/matlab-7sp1/bin/glnx86/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   445
       $ENV{HOME}/matlab-7sp1/bin/glnx86/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   446
       $ENV{HOME}/redhat-matlab/bin/glnx86/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   447
@@ -68,7 +69,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   448
   ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   449
     # AMD64:
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   450
     SET(MATLAB_ROOT
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   451
-      /usr/local/matlab-7sp1/bin/glnxa64/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   452
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   453
+#      /usr/local/matlab-7sp1/bin/glnxa64/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   454
       /opt/matlab-7sp1/bin/glnxa64/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   455
       $ENV{HOME}/matlab7_64/bin/glnxa64/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   456
       $ENV{HOME}/matlab-7sp1/bin/glnxa64/
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   457
@@ -89,7 +91,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   458
     )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   459
   FIND_PATH(MATLAB_INCLUDE_DIR
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   460
     "mex.h"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   461
-    "/usr/local/matlab-7sp1/extern/include/"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   462
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   463
+#    "/usr/local/matlab-7sp1/extern/include/"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   464
     "/opt/matlab-7sp1/extern/include/"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   465
     "$ENV{HOME}/matlab-7sp1/extern/include/"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   466
     "$ENV{HOME}/redhat-matlab/extern/include/"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   467
diff -ru cmake-2.8.6.org//Modules/FindOpenAL.cmake cmake-2.8.6/Modules/FindOpenAL.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   468
--- cmake-2.8.6.org//Modules/FindOpenAL.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   469
+++ cmake-2.8.6/Modules/FindOpenAL.cmake	Tue Oct 11 11:06:21 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   470
@@ -68,11 +68,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   471
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   472
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   473
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   474
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   475
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   476
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   477
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   478
   /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   479
   /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   480
-  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   481
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   482
+#  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   483
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   484
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   485
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   486
@@ -81,15 +83,17 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   487
   NAMES OpenAL al openal OpenAL32
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   488
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   489
   $ENV{OPENALDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   490
-  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   491
+  PATH_SUFFIXES lib64 lib lib/32 lib/64 libs64 libs libs/Win32 libs/Win64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   492
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   493
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   494
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   495
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   496
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   497
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   498
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   499
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   500
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   501
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   502
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   503
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   504
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   505
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   506
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   507
diff -ru cmake-2.8.6.org//Modules/FindOpenThreads.cmake cmake-2.8.6/Modules/FindOpenThreads.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   508
--- cmake-2.8.6.org//Modules/FindOpenThreads.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   509
+++ cmake-2.8.6/Modules/FindOpenThreads.cmake	Mon Oct 10 17:06:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   510
@@ -64,7 +64,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   511
     PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   512
         /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   513
         /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   514
-        /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   515
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   516
+#        /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   517
         /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   518
         /usr/freeware
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   519
     PATH_SUFFIXES include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   520
@@ -84,7 +85,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   521
     PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   522
         /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   523
         /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   524
-        /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   525
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   526
+#        /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   527
         /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   528
         /usr/freeware
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   529
     PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   530
@@ -104,7 +106,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   531
     PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   532
         /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   533
         /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   534
-        /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   535
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   536
+#        /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   537
         /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   538
         /usr/freeware
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   539
     PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   540
diff -ru cmake-2.8.6.org//Modules/FindPHP4.cmake cmake-2.8.6/Modules/FindPHP4.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   541
--- cmake-2.8.6.org//Modules/FindPHP4.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   542
+++ cmake-2.8.6/Modules/FindPHP4.cmake	Mon Oct 10 17:07:51 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   543
@@ -22,10 +22,12 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   544
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   545
 SET(PHP4_POSSIBLE_INCLUDE_PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   546
   /usr/include/php4
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   547
-  /usr/local/include/php4
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   548
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   549
+#  /usr/local/include/php4
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   550
   /usr/include/php
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   551
-  /usr/local/include/php
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   552
-  /usr/local/apache/php
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   553
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   554
+#  /usr/local/include/php
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   555
+#  /usr/local/apache/php
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   556
   )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   557
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   558
 SET(PHP4_POSSIBLE_LIB_PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   559
diff -ru cmake-2.8.6.org//Modules/FindPhysFS.cmake cmake-2.8.6/Modules/FindPhysFS.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   560
--- cmake-2.8.6.org//Modules/FindPhysFS.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   561
+++ cmake-2.8.6/Modules/FindPhysFS.cmake	Tue Oct 11 11:06:49 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   562
@@ -30,7 +30,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   563
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   564
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   565
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   566
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   567
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   568
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   569
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   570
   /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   571
   /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   572
@@ -42,11 +43,12 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   573
   NAMES physfs
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   574
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   575
   $ENV{PHYSFSDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   576
-  PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   577
+  PATH_SUFFIXES lib64 lib lib/32 lib/64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   578
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   579
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   580
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   581
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   582
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   583
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   584
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   585
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   586
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   587
diff -ru cmake-2.8.6.org//Modules/FindPike.cmake cmake-2.8.6/Modules/FindPike.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   588
--- cmake-2.8.6.org//Modules/FindPike.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   589
+++ cmake-2.8.6/Modules/FindPike.cmake	Mon Oct 10 17:09:13 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   590
@@ -22,7 +22,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   591
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   592
 FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   593
   /usr/include/pike/*
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   594
-  /usr/local/include/pike/*)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   595
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   596
+#  /usr/local/include/pike/*)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   597
+  )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   598
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   599
 FIND_PATH(PIKE_INCLUDE_PATH program.h
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   600
   ${PIKE_POSSIBLE_INCLUDE_PATHS})
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   601
diff -ru cmake-2.8.6.org//Modules/FindProducer.cmake cmake-2.8.6/Modules/FindProducer.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   602
--- cmake-2.8.6.org//Modules/FindProducer.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   603
+++ cmake-2.8.6/Modules/FindProducer.cmake	Tue Oct 11 11:07:52 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   604
@@ -51,11 +51,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   605
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   606
     ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   607
     /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   608
-    /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   609
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   610
+#    /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   611
     /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   612
     /sw/include # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   613
     /opt/local/include # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   614
-    /opt/csw/include # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   615
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   616
+#    /opt/csw/include # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   617
     /opt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   618
     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   619
     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   620
@@ -67,13 +69,15 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   621
   $ENV{PRODUCER_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   622
   $ENV{OSG_DIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   623
   $ENV{OSGDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   624
-  PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   625
+  PATH_SUFFIXES lib64 lib lib/32 lib/64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   626
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   627
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   628
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   629
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   630
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   631
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   632
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   633
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   634
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   635
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   636
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   637
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   638
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   639
diff -ru cmake-2.8.6.org//Modules/FindQt.cmake cmake-2.8.6/Modules/FindQt.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   640
--- cmake-2.8.6.org//Modules/FindQt.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   641
+++ cmake-2.8.6/Modules/FindQt.cmake	Tue Oct 11 10:08:04 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   642
@@ -82,8 +82,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   643
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   644
   ${qt_headers}/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   645
   $ENV{QTDIR}/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   646
-  /usr/local/qt/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   647
-  /usr/local/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   648
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   649
+#  /usr/local/qt/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   650
+#  /usr/local/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   651
   /usr/lib/qt/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   652
   /usr/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   653
   /usr/share/qt4/include/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   654
@@ -101,8 +102,9 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   655
   C:/Qt/3.3.3Educational/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   656
   $ENV{QTDIR}/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   657
   /usr/include/qt3/Qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   658
-  /usr/local/qt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   659
-  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   660
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   661
+#  /usr/local/qt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   662
+#  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   663
   /usr/lib/qt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   664
   /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   665
   /usr/share/qt3/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   666
diff -ru cmake-2.8.6.org//Modules/FindQt3.cmake cmake-2.8.6/Modules/FindQt3.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   667
--- cmake-2.8.6.org//Modules/FindQt3.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   668
+++ cmake-2.8.6/Modules/FindQt3.cmake	Tue Oct 11 10:08:58 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   669
@@ -53,7 +53,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   670
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   671
   $ENV{QTDIR}/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   672
   ${GLOB_PATHS_BIN}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   673
-  /usr/local/qt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   674
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   675
+#  /usr/local/qt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   676
   /usr/lib/qt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   677
   /usr/lib/qt3/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   678
   /usr/include/qt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   679
@@ -91,7 +92,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   680
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   681
     $ENV{QTDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   682
     ${GLOB_PATHS_LIB}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   683
-    /usr/local/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   684
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   685
+#    /usr/local/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   686
     /usr/lib/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   687
     /usr/lib/qt3/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   688
     /usr/lib/qt3/lib64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   689
@@ -111,7 +113,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   690
     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   691
     $ENV{QTDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   692
     ${GLOB_PATHS_LIB}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   693
-    /usr/local/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   694
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   695
+#    /usr/local/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   696
     /usr/lib/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   697
     /usr/lib/qt3/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   698
     /usr/lib/qt3/lib64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   699
@@ -129,7 +132,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   700
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   701
   $ENV{QTDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   702
   ${GLOB_PATHS_LIB}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   703
-  /usr/local/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   704
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   705
+#  /usr/local/qt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   706
   /usr/lib/qt3/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   707
   /usr/lib/qt3/lib64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   708
   /usr/share/qt3/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   709
@@ -147,7 +151,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   710
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   711
   $ENV{QTDIR}/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   712
   ${GLOB_PATHS_BIN}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   713
-  /usr/local/qt/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   714
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   715
+#  /usr/local/qt/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   716
   /usr/lib/qt/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   717
   /usr/lib/qt3/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   718
   /usr/share/qt3/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   719
@@ -169,7 +174,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   720
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   721
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   722
   ${GLOB_PATHS_BIN}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   723
-  /usr/local/qt/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   724
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   725
+#  /usr/local/qt/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   726
   /usr/lib/qt/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   727
   /usr/lib/qt3/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   728
   /usr/share/qt3/bin
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   729
diff -ru cmake-2.8.6.org//Modules/FindSDL.cmake cmake-2.8.6/Modules/FindSDL.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   730
--- cmake-2.8.6.org//Modules/FindSDL.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   731
+++ cmake-2.8.6/Modules/FindSDL.cmake	Tue Oct 11 10:09:48 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   732
@@ -72,13 +72,15 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   733
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   734
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   735
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   736
-  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   737
-  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   738
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   739
+#  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   740
+#  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   741
   /usr/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   742
   /usr/include/SDL11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   743
   /sw # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   744
   /opt/local # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   745
-  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   746
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   747
+#  /opt/csw # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   748
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   749
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   750
 #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   751
@@ -93,7 +95,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   752
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   753
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   754
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   755
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   756
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   757
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   758
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   759
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   760
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   761
@@ -113,7 +116,8 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   762
       PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   763
       /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   764
       /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   765
-      /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   766
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   767
+#      /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   768
       /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   769
     )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   770
   ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   771
diff -ru cmake-2.8.6.org//Modules/FindSDL_image.cmake cmake-2.8.6/Modules/FindSDL_image.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   772
--- cmake-2.8.6.org//Modules/FindSDL_image.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   773
+++ cmake-2.8.6/Modules/FindSDL_image.cmake	Tue Oct 11 10:10:36 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   774
@@ -33,20 +33,24 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   775
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   776
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   777
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   778
-  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   779
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   780
+#  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   781
   /usr/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   782
-  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   783
-  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   784
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   785
+#  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   786
+#  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   787
   /usr/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   788
   /usr/include/SDL11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   789
-  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   790
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   791
+#  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   792
   /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   793
   /sw/include/SDL # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   794
   /sw/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   795
   /opt/local/include/SDL # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   796
   /opt/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   797
-  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   798
-  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   799
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   800
+#  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   801
+#  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   802
   /opt/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   803
   /opt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   804
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   805
@@ -60,11 +64,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   806
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   807
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   808
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   809
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   810
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   811
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   812
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   813
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   814
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   815
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   816
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   817
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   818
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   819
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   820
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   821
diff -ru cmake-2.8.6.org//Modules/FindSDL_mixer.cmake cmake-2.8.6/Modules/FindSDL_mixer.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   822
--- cmake-2.8.6.org//Modules/FindSDL_mixer.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   823
+++ cmake-2.8.6/Modules/FindSDL_mixer.cmake	Tue Oct 11 11:09:06 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   824
@@ -33,20 +33,24 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   825
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   826
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   827
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   828
-  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   829
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   830
+#  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   831
   /usr/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   832
-  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   833
-  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   834
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   835
+#  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   836
+#  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   837
   /usr/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   838
   /usr/include/SDL11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   839
-  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   840
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   841
+#  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   842
   /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   843
   /sw/include/SDL # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   844
   /sw/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   845
   /opt/local/include/SDL # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   846
   /opt/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   847
-  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   848
-  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   849
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   850
+#  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   851
+#  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   852
   /opt/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   853
   /opt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   854
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   855
@@ -56,15 +60,17 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   856
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   857
   $ENV{SDLMIXERDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   858
   $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   859
-  PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   860
+  PATH_SUFFIXES lib64 lib lib/32 lib/64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   861
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   862
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   863
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   864
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   865
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   866
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   867
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   868
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   869
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   870
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   871
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   872
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   873
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   874
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   875
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   876
diff -ru cmake-2.8.6.org//Modules/FindSDL_net.cmake cmake-2.8.6/Modules/FindSDL_net.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   877
--- cmake-2.8.6.org//Modules/FindSDL_net.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   878
+++ cmake-2.8.6/Modules/FindSDL_net.cmake	Tue Oct 11 11:10:06 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   879
@@ -33,20 +33,24 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   880
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   881
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   882
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   883
-  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   884
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   885
+#  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   886
   /usr/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   887
-  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   888
-  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   889
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   890
+#  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   891
+#  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   892
   /usr/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   893
   /usr/include/SDL11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   894
-  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   895
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   896
+#  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   897
   /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   898
   /sw/include/SDL # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   899
   /sw/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   900
   /opt/local/include/SDL # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   901
   /opt/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   902
-  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   903
-  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   904
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   905
+#  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   906
+#  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   907
   /opt/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   908
   /opt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   909
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   910
@@ -55,15 +59,17 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   911
   HINTS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   912
   $ENV{SDLNETDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   913
   $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   914
-  PATH_SUFFIXES lib64 lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   915
+  PATH_SUFFIXES lib64 lib lib/32 lib/64
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   916
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   917
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   918
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   919
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   920
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   921
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   922
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   923
   /sw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   924
   /opt/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   925
-  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   926
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   927
+#  /opt/csw
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   928
   /opt
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   929
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   930
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   931
diff -ru cmake-2.8.6.org//Modules/FindSDL_sound.cmake cmake-2.8.6/Modules/FindSDL_sound.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   932
--- cmake-2.8.6.org//Modules/FindSDL_sound.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   933
+++ cmake-2.8.6/Modules/FindSDL_sound.cmake	Tue Oct 11 10:15:08 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   934
@@ -80,20 +80,24 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   935
   $ENV{SDLDIR}/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   936
   $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   937
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   938
-  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   939
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   940
+#  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   941
   /usr/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   942
-  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   943
-  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   944
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   945
+#  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   946
+#  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   947
   /usr/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   948
   /usr/include/SDL11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   949
-  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   950
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   951
+#  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   952
   /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   953
   /sw/include/SDL # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   954
   /sw/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   955
   /opt/local/include/SDL # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   956
   /opt/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   957
-  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   958
-  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   959
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   960
+#  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   961
+#  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   962
   /opt/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   963
   /opt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   964
   )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   965
@@ -106,11 +110,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   966
   $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   967
   $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   968
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   969
-  /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   970
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   971
+#  /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   972
   /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   973
   /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   974
   /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   975
-  /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   976
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   977
+#  /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   978
   /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   979
   )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   980
 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   981
@@ -223,11 +229,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   982
          $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   983
          $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   984
          $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   985
-         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   986
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   987
+#         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   988
          /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   989
          /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   990
          /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   991
-         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   992
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   993
+#         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   994
        /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   995
        ) 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   996
        IF(MIKMOD_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   997
@@ -246,11 +254,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   998
          $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
   999
          $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1000
          $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1001
-         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1002
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1003
+#         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1004
          /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1005
          /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1006
          /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1007
-         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1008
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1009
+#         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1010
        /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1011
        )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1012
        IF(MODPLUG_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1013
@@ -272,11 +282,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1014
          $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1015
          $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1016
          $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1017
-         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1018
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1019
+#         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1020
          /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1021
          /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1022
          /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1023
-         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1024
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1025
+#         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1026
        /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1027
          )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1028
        IF(VORBIS_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1029
@@ -294,11 +306,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1030
          $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1031
          $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1032
          $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1033
-         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1034
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1035
+#         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1036
          /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1037
          /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1038
          /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1039
-         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1040
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1041
+#         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1042
        /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1043
          )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1044
        IF(OGG_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1045
@@ -318,11 +332,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1046
          $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1047
          $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1048
          $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1049
-         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1050
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1051
+#         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1052
          /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1053
          /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1054
          /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1055
-         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1056
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1057
+#         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1058
        /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1059
          )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1060
        IF(SMPEG_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1061
@@ -342,11 +358,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1062
          $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1063
          $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1064
          $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1065
-         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1066
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1067
+#         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1068
          /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1069
          /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1070
          /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1071
-         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1072
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1073
+#         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1074
        /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1075
          )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1076
        IF(FLAC_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1077
@@ -369,11 +387,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1078
          $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1079
          $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1080
          $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1081
-         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1082
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1083
+#         /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1084
          /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1085
          /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1086
          /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1087
-         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1088
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1089
+#         /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1090
        /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1091
          )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1092
        IF(SPEEX_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1093
@@ -396,11 +416,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1094
            $ENV{SDLSOUNDDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1095
            $ENV{SDLDIR}/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1096
            $ENV{SDLDIR}
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1097
-           /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1098
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1099
+#           /usr/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1100
            /usr/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1101
            /sw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1102
            /opt/local/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1103
-           /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1104
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1105
+#           /opt/csw/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1106
          /opt/lib
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1107
            )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1108
          IF(OGG_LIBRARY)
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1109
diff -ru cmake-2.8.6.org//Modules/FindSDL_ttf.cmake cmake-2.8.6/Modules/FindSDL_ttf.cmake
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1110
--- cmake-2.8.6.org//Modules/FindSDL_ttf.cmake	Tue Oct  4 09:09:24 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1111
+++ cmake-2.8.6/Modules/FindSDL_ttf.cmake	Tue Oct 11 10:15:50 2011
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1112
@@ -33,20 +33,24 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1113
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1114
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1115
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1116
-  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1117
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1118
+#  /usr/local/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1119
   /usr/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1120
-  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1121
-  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1122
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1123
+#  /usr/local/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1124
+#  /usr/local/include/SDL11 # FreeBSD ports
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1125
   /usr/include/SDL12
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1126
   /usr/include/SDL11
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1127
-  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1128
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1129
+#  /usr/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1130
   /usr/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1131
   /sw/include/SDL # Fink
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1132
   /sw/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1133
   /opt/local/include/SDL # DarwinPorts
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1134
   /opt/local/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1135
-  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1136
-  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1137
+# Uncomment the following to enable /opt/csw search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1138
+#  /opt/csw/include/SDL # Blastwave
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1139
+#  /opt/csw/include 
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1140
   /opt/include/SDL
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1141
   /opt/include
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1142
 )
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1143
@@ -59,11 +63,13 @@
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1144
   PATHS
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1145
   ~/Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1146
   /Library/Frameworks
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1147
-  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1148
+# Uncomment the following to enable /usr/local search
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1149
+#  /usr/local
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
parents:
diff changeset
  1150
   /usr
db6c0cd206dd 6892526 cmake upgrade to v2.8.6
April Chin <april.chin@oracle.com>
<