|
1 diff -ru cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake |
|
2 --- cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake Tue Oct 4 09:09:24 2011 |
|
3 +++ cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake Mon Oct 10 13:44:03 2011 |
|
4 @@ -55,9 +55,10 @@ |
|
5 /usr/bin |
|
6 /usr/lib/java/bin |
|
7 /usr/share/java/bin |
|
8 - /usr/local/bin |
|
9 - /usr/local/java/bin |
|
10 - /usr/local/java/share/bin |
|
11 +# Uncomment the following to enable /usr/local search |
|
12 +# /usr/local/bin |
|
13 +# /usr/local/java/bin |
|
14 +# /usr/local/java/share/bin |
|
15 /usr/java/j2sdk1.4.2_04 |
|
16 /usr/lib/j2sdk1.4-sun/bin |
|
17 /usr/java/j2sdk1.4.2_09/bin |
|
18 diff -ru cmake-2.8.6.org//Modules/CMakeDetermineSystem.cmake cmake-2.8.6/Modules/CMakeDetermineSystem.cmake |
|
19 --- cmake-2.8.6.org//Modules/CMakeDetermineSystem.cmake Tue Oct 4 09:09:24 2011 |
|
20 +++ cmake-2.8.6/Modules/CMakeDetermineSystem.cmake Mon Oct 10 13:47:49 2011 |
|
21 @@ -43,7 +43,9 @@ |
|
22 |
|
23 # find out on which system cmake runs |
|
24 IF(CMAKE_HOST_UNIX) |
|
25 - FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) |
|
26 +FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin ) |
|
27 +# Uncomment the following to enable /usr/local search |
|
28 +# FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) |
|
29 IF(CMAKE_UNAME) |
|
30 EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) |
|
31 EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) |
|
32 diff -ru cmake-2.8.6.org//Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake |
|
33 --- cmake-2.8.6.org//Modules/FindBLAS.cmake Tue Oct 4 09:09:24 2011 |
|
34 +++ cmake-2.8.6/Modules/FindBLAS.cmake Mon Oct 10 16:55:05 2011 |
|
35 @@ -80,9 +80,13 @@ |
|
36 if (WIN32) |
|
37 set(_libdir ENV LIB) |
|
38 elseif (APPLE) |
|
39 - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) |
|
40 + set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH) |
|
41 +# Uncomment the following to enable /usr/local search |
|
42 +# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) |
|
43 else () |
|
44 - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) |
|
45 + set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH) |
|
46 +# Uncomment the following to enable /usr/local search |
|
47 +# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) |
|
48 endif () |
|
49 endif () |
|
50 foreach(_library ${_list}) |
|
51 diff -ru cmake-2.8.6.org//Modules/FindFLTK.cmake cmake-2.8.6/Modules/FindFLTK.cmake |
|
52 --- cmake-2.8.6.org//Modules/FindFLTK.cmake Tue Oct 4 09:09:24 2011 |
|
53 +++ cmake-2.8.6/Modules/FindFLTK.cmake Tue Oct 11 11:54:22 2011 |
|
54 @@ -103,11 +103,15 @@ |
|
55 ${FLTK_DIR_SEARCH} |
|
56 |
|
57 # Look in standard UNIX install locations. |
|
58 - /usr/local/lib/fltk |
|
59 + |
|
60 +# Uncomment the following to enable /usr/local search |
|
61 +# /usr/local/lib/fltk |
|
62 /usr/lib/fltk |
|
63 - /usr/local/include |
|
64 +# Uncomment the following to enable /usr/local search |
|
65 +# /usr/local/include |
|
66 /usr/include |
|
67 - /usr/local/fltk |
|
68 +# Uncomment the following to enable /usr/local search |
|
69 +# /usr/local/fltk |
|
70 /usr/X11R6/include |
|
71 |
|
72 # Read from the CMakeSetup registry entries. It is likely that |
|
73 @@ -221,7 +225,8 @@ |
|
74 ENDIF() |
|
75 |
|
76 SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} |
|
77 - /usr/local/fltk |
|
78 +# Uncomment the following to enable /usr/local search |
|
79 +# /usr/local/fltk |
|
80 /usr/X11R6/include |
|
81 ${_FLTK_POSSIBLE_INCLUDE_DIRS} |
|
82 ) |
|
83 @@ -242,7 +247,8 @@ |
|
84 ENDIF() |
|
85 |
|
86 SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} |
|
87 - /usr/local/fltk/lib |
|
88 +# Uncomment the following to enable /usr/local search |
|
89 +# /usr/local/fltk/lib |
|
90 /usr/X11R6/lib |
|
91 ${FLTK_INCLUDE_DIR}/lib |
|
92 ${_FLTK_POSSIBLE_LIBRARY_DIR} |
|
93 diff -ru cmake-2.8.6.org//Modules/FindFLTK2.cmake cmake-2.8.6/Modules/FindFLTK2.cmake |
|
94 --- cmake-2.8.6.org//Modules/FindFLTK2.cmake Tue Oct 4 09:09:24 2011 |
|
95 +++ cmake-2.8.6/Modules/FindFLTK2.cmake Mon Oct 10 16:48:15 2011 |
|
96 @@ -83,11 +83,15 @@ |
|
97 ${FLTK2_DIR_SEARCH} |
|
98 |
|
99 # Look in standard UNIX install locations. |
|
100 - /usr/local/lib/fltk2 |
|
101 + |
|
102 +# Uncomment the following to enable /usr/local search |
|
103 +# /usr/local/lib/fltk2 |
|
104 /usr/lib/fltk2 |
|
105 - /usr/local/include |
|
106 +# Uncomment the following to enable /usr/local search |
|
107 +# /usr/local/include |
|
108 /usr/include |
|
109 - /usr/local/fltk2 |
|
110 +# Uncomment the following to enable /usr/local search |
|
111 +# /usr/local/fltk2 |
|
112 /usr/X11R6/include |
|
113 |
|
114 # Read from the CMakeSetup registry entries. It is likely that |
|
115 @@ -193,9 +197,11 @@ |
|
116 ENDIF(FLTK2_FLUID_EXECUTABLE) |
|
117 |
|
118 SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH} |
|
119 - /usr/local/include |
|
120 +# Uncomment the following to enable /usr/local search |
|
121 +# /usr/local/include |
|
122 /usr/include |
|
123 - /usr/local/fltk2 |
|
124 +# Uncomment the following to enable /usr/local search |
|
125 +# /usr/local/fltk2 |
|
126 /usr/X11R6/include |
|
127 ) |
|
128 |
|
129 @@ -203,8 +209,9 @@ |
|
130 |
|
131 SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH} |
|
132 /usr/lib |
|
133 - /usr/local/lib |
|
134 - /usr/local/fltk2/lib |
|
135 +# Uncomment the following to enable /usr/local search |
|
136 +# /usr/local/lib |
|
137 +# /usr/local/fltk2/lib |
|
138 /usr/X11R6/lib |
|
139 ${FLTK2_INCLUDE_DIR}/lib |
|
140 ) |
|
141 diff -ru cmake-2.8.6.org//Modules/FindFreetype.cmake cmake-2.8.6/Modules/FindFreetype.cmake |
|
142 --- cmake-2.8.6.org//Modules/FindFreetype.cmake Tue Oct 4 09:09:24 2011 |
|
143 +++ cmake-2.8.6/Modules/FindFreetype.cmake Mon Oct 10 16:50:47 2011 |
|
144 @@ -45,8 +45,9 @@ |
|
145 HINTS |
|
146 $ENV{FREETYPE_DIR} |
|
147 PATHS |
|
148 - /usr/local/X11R6/include |
|
149 - /usr/local/X11/include |
|
150 +# Uncomment the following to enable /usr/local search |
|
151 +# /usr/local/X11R6/include |
|
152 +# /usr/local/X11/include |
|
153 /usr/freeware/include |
|
154 ) |
|
155 |
|
156 @@ -54,8 +55,9 @@ |
|
157 HINTS |
|
158 $ENV{FREETYPE_DIR}/include/freetype2 |
|
159 PATHS |
|
160 - /usr/local/X11R6/include |
|
161 - /usr/local/X11/include |
|
162 +# Uncomment the following to enable /usr/local search |
|
163 +# /usr/local/X11R6/include |
|
164 +# /usr/local/X11/include |
|
165 /usr/freeware/include |
|
166 PATH_SUFFIXES freetype2 |
|
167 ) |
|
168 @@ -66,8 +68,9 @@ |
|
169 $ENV{FREETYPE_DIR} |
|
170 PATH_SUFFIXES lib64 lib |
|
171 PATHS |
|
172 - /usr/local/X11R6 |
|
173 - /usr/local/X11 |
|
174 +# Uncomment the following to enable /usr/local search |
|
175 +# /usr/local/X11R6 |
|
176 +# /usr/local/X11 |
|
177 /usr/freeware |
|
178 ) |
|
179 |
|
180 diff -ru cmake-2.8.6.org//Modules/FindGDAL.cmake cmake-2.8.6/Modules/FindGDAL.cmake |
|
181 --- cmake-2.8.6.org//Modules/FindGDAL.cmake Tue Oct 4 09:09:24 2011 |
|
182 +++ cmake-2.8.6/Modules/FindGDAL.cmake Mon Oct 10 16:52:52 2011 |
|
183 @@ -53,7 +53,8 @@ |
|
184 /Library/Frameworks/gdal.framework/Headers |
|
185 /sw # Fink |
|
186 /opt/local # DarwinPorts |
|
187 - /opt/csw # Blastwave |
|
188 +# Uncomment the following to enable /opt/csw search |
|
189 +# /opt/csw # Blastwave |
|
190 /opt |
|
191 ) |
|
192 |
|
193 @@ -70,7 +71,8 @@ |
|
194 PATHS |
|
195 /sw # Fink |
|
196 /opt/local # DarwinPorts |
|
197 - /opt/csw # Blastwave |
|
198 +# Uncomment the following to enable /opt/csw search |
|
199 +# /opt/csw # Blastwave |
|
200 /opt |
|
201 ) |
|
202 |
|
203 @@ -95,7 +97,8 @@ |
|
204 PATHS |
|
205 /sw |
|
206 /opt/local |
|
207 - /opt/csw |
|
208 +# Uncomment the following to enable /opt/csw search |
|
209 +# /opt/csw |
|
210 /opt |
|
211 /usr/freeware |
|
212 ) |
|
213 diff -ru cmake-2.8.6.org//Modules/FindGTK.cmake cmake-2.8.6/Modules/FindGTK.cmake |
|
214 --- cmake-2.8.6.org//Modules/FindGTK.cmake Tue Oct 4 09:09:24 2011 |
|
215 +++ cmake-2.8.6/Modules/FindGTK.cmake Mon Oct 10 16:53:18 2011 |
|
216 @@ -36,9 +36,11 @@ |
|
217 FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h |
|
218 PATHS |
|
219 /usr/openwin/share/include |
|
220 - /usr/local/include/glib12 |
|
221 +# Uncomment the following to enable /usr/local search |
|
222 +# /usr/local/include/glib12 |
|
223 /usr/lib/glib/include |
|
224 - /usr/local/lib/glib/include |
|
225 +# Uncomment the following to enable /usr/local search |
|
226 +# /usr/local/lib/glib/include |
|
227 /opt/gnome/include |
|
228 /opt/gnome/lib/glib/include |
|
229 ) |
|
230 diff -ru cmake-2.8.6.org//Modules/FindGTK2.cmake cmake-2.8.6/Modules/FindGTK2.cmake |
|
231 --- cmake-2.8.6.org//Modules/FindGTK2.cmake Tue Oct 4 09:09:24 2011 |
|
232 +++ cmake-2.8.6/Modules/FindGTK2.cmake Mon Oct 10 16:53:36 2011 |
|
233 @@ -185,8 +185,9 @@ |
|
234 |
|
235 find_path(${_var} ${_hdr} |
|
236 PATHS |
|
237 - /usr/local/lib64 |
|
238 - /usr/local/lib |
|
239 +# Uncomment the following to enable /usr/local search |
|
240 +# /usr/local/lib64 |
|
241 +# /usr/local/lib |
|
242 /usr/lib64 |
|
243 /usr/lib |
|
244 /opt/gnome/include |
|
245 diff -ru cmake-2.8.6.org//Modules/FindJNI.cmake cmake-2.8.6/Modules/FindJNI.cmake |
|
246 --- cmake-2.8.6.org//Modules/FindJNI.cmake Tue Oct 4 09:09:24 2011 |
|
247 +++ cmake-2.8.6/Modules/FindJNI.cmake Mon Oct 10 16:54:47 2011 |
|
248 @@ -102,12 +102,14 @@ |
|
249 ${_JAVA_HOME}/lib |
|
250 ${_JAVA_HOME} |
|
251 /usr/lib |
|
252 - /usr/local/lib |
|
253 +# Uncomment the following to enable /usr/local search |
|
254 +# /usr/local/lib |
|
255 /usr/lib/jvm/java/lib |
|
256 /usr/lib/java/jre/lib/{libarch} |
|
257 /usr/lib/jvm/jre/lib/{libarch} |
|
258 - /usr/local/lib/java/jre/lib/{libarch} |
|
259 - /usr/local/share/java/jre/lib/{libarch} |
|
260 +# Uncomment the following to enable /usr/local search |
|
261 +# /usr/local/lib/java/jre/lib/{libarch} |
|
262 +# /usr/local/share/java/jre/lib/{libarch} |
|
263 /usr/lib/j2sdk1.4-sun/jre/lib/{libarch} |
|
264 /usr/lib/j2sdk1.5-sun/jre/lib/{libarch} |
|
265 /opt/sun-jdk-1.5.0.04/jre/lib/{libarch} |
|
266 @@ -139,15 +141,18 @@ |
|
267 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" |
|
268 ${_JAVA_HOME}/include |
|
269 /usr/include |
|
270 - /usr/local/include |
|
271 +# Uncomment the following to enable /usr/local search |
|
272 +# /usr/local/include |
|
273 /usr/lib/java/include |
|
274 - /usr/local/lib/java/include |
|
275 +# Uncomment the following to enable /usr/local search |
|
276 +# /usr/local/lib/java/include |
|
277 /usr/lib/jvm/java/include |
|
278 /usr/lib/jvm/java-6-sun/include |
|
279 /usr/lib/jvm/java-1.5.0-sun/include |
|
280 /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex |
|
281 /usr/lib/jvm/java-6-openjdk/include |
|
282 - /usr/local/share/java/include |
|
283 +# Uncomment the following to enable /usr/local search |
|
284 +# /usr/local/share/java/include |
|
285 /usr/lib/j2sdk1.4-sun/include |
|
286 /usr/lib/j2sdk1.5-sun/include |
|
287 /opt/sun-jdk-1.5.0.04/include |
|
288 diff -ru cmake-2.8.6.org//Modules/FindJava.cmake cmake-2.8.6/Modules/FindJava.cmake |
|
289 --- cmake-2.8.6.org//Modules/FindJava.cmake Tue Oct 4 09:09:24 2011 |
|
290 +++ cmake-2.8.6/Modules/FindJava.cmake Mon Oct 10 16:54:01 2011 |
|
291 @@ -73,8 +73,9 @@ |
|
292 SET(_JAVA_PATHS |
|
293 /usr/lib/java/bin |
|
294 /usr/share/java/bin |
|
295 - /usr/local/java/bin |
|
296 - /usr/local/java/share/bin |
|
297 +# Uncomment the following to enable /usr/local search |
|
298 +# /usr/local/java/bin |
|
299 +# /usr/local/java/share/bin |
|
300 /usr/java/j2sdk1.4.2_04 |
|
301 /usr/lib/j2sdk1.4-sun/bin |
|
302 /usr/java/j2sdk1.4.2_09/bin |
|
303 diff -ru cmake-2.8.6.org//Modules/FindKDE3.cmake cmake-2.8.6/Modules/FindKDE3.cmake |
|
304 --- cmake-2.8.6.org//Modules/FindKDE3.cmake Tue Oct 4 09:09:24 2011 |
|
305 +++ cmake-2.8.6/Modules/FindKDE3.cmake Mon Oct 10 16:55:28 2011 |
|
306 @@ -141,7 +141,8 @@ |
|
307 /opt/kde3/include |
|
308 /opt/kde/include |
|
309 /usr/include/kde |
|
310 - /usr/local/include/kde |
|
311 +# Uncomment the following to enable /usr/local search |
|
312 +# /usr/local/include/kde |
|
313 ) |
|
314 |
|
315 #now the KDE library directory |
|
316 diff -ru cmake-2.8.6.org//Modules/FindLAPACK.cmake cmake-2.8.6/Modules/FindLAPACK.cmake |
|
317 --- cmake-2.8.6.org//Modules/FindLAPACK.cmake Tue Oct 4 09:09:24 2011 |
|
318 +++ cmake-2.8.6/Modules/FindLAPACK.cmake Mon Oct 10 16:56:57 2011 |
|
319 @@ -69,9 +69,13 @@ |
|
320 if (WIN32) |
|
321 set(_libdir ENV LIB) |
|
322 elseif (APPLE) |
|
323 - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) |
|
324 + set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH) |
|
325 +# Uncomment the following to enable /usr/local search |
|
326 +# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) |
|
327 else () |
|
328 - set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) |
|
329 + set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH) |
|
330 +# Uncomment the following to enable /usr/local search |
|
331 +# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) |
|
332 endif () |
|
333 endif () |
|
334 foreach(_library ${_list}) |
|
335 diff -ru cmake-2.8.6.org//Modules/FindLua50.cmake cmake-2.8.6/Modules/FindLua50.cmake |
|
336 --- cmake-2.8.6.org//Modules/FindLua50.cmake Tue Oct 4 09:09:24 2011 |
|
337 +++ cmake-2.8.6/Modules/FindLua50.cmake Tue Oct 11 11:01:21 2011 |
|
338 @@ -31,11 +31,13 @@ |
|
339 PATHS |
|
340 ~/Library/Frameworks |
|
341 /Library/Frameworks |
|
342 - /usr/local |
|
343 +# Uncomment the following to enable /usr/local search |
|
344 +# /usr/local |
|
345 /usr |
|
346 /sw # Fink |
|
347 /opt/local # DarwinPorts |
|
348 - /opt/csw # Blastwave |
|
349 +# Uncomment the following to enable /opt/csw search |
|
350 +# /opt/csw # Blastwave |
|
351 /opt |
|
352 ) |
|
353 |
|
354 @@ -43,15 +45,17 @@ |
|
355 NAMES lua50 lua5.0 lua-5.0 lua5 lua |
|
356 HINTS |
|
357 $ENV{LUA_DIR} |
|
358 - PATH_SUFFIXES lib64 lib |
|
359 + PATH_SUFFIXES lib64 lib lib/32 lib/64 |
|
360 PATHS |
|
361 ~/Library/Frameworks |
|
362 /Library/Frameworks |
|
363 - /usr/local |
|
364 +# Uncomment the following to enable /usr/local search |
|
365 +# /usr/local |
|
366 /usr |
|
367 /sw |
|
368 /opt/local |
|
369 - /opt/csw |
|
370 +# Uncomment the following to enable /opt/csw search |
|
371 +# /opt/csw |
|
372 /opt |
|
373 ) |
|
374 |
|
375 @@ -65,13 +69,15 @@ |
|
376 HINTS |
|
377 $ENV{LUALIB_DIR} |
|
378 $ENV{LUA_DIR} |
|
379 - PATH_SUFFIXES lib64 lib |
|
380 + PATH_SUFFIXES lib64 lib lib/32 lib/64 |
|
381 PATHS |
|
382 - /usr/local |
|
383 +# Uncomment the following to enable /usr/local search |
|
384 +# /usr/local |
|
385 /usr |
|
386 /sw |
|
387 /opt/local |
|
388 - /opt/csw |
|
389 +# Uncomment the following to enable /opt/csw search |
|
390 +# /opt/csw |
|
391 /opt |
|
392 ) |
|
393 IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua) |
|
394 diff -ru cmake-2.8.6.org//Modules/FindLua51.cmake cmake-2.8.6/Modules/FindLua51.cmake |
|
395 --- cmake-2.8.6.org//Modules/FindLua51.cmake Tue Oct 4 09:09:24 2011 |
|
396 +++ cmake-2.8.6/Modules/FindLua51.cmake Tue Oct 11 11:05:48 2011 |
|
397 @@ -31,11 +31,13 @@ |
|
398 PATHS |
|
399 ~/Library/Frameworks |
|
400 /Library/Frameworks |
|
401 - /usr/local |
|
402 +# Uncomment the following to enable /usr/local search |
|
403 +# /usr/local |
|
404 /usr |
|
405 /sw # Fink |
|
406 /opt/local # DarwinPorts |
|
407 - /opt/csw # Blastwave |
|
408 +# Uncomment the following to enable /opt/csw search |
|
409 +# /opt/csw # Blastwave |
|
410 /opt |
|
411 ) |
|
412 |
|
413 @@ -43,15 +45,17 @@ |
|
414 NAMES lua51 lua5.1 lua-5.1 lua |
|
415 HINTS |
|
416 $ENV{LUA_DIR} |
|
417 - PATH_SUFFIXES lib64 lib |
|
418 + PATH_SUFFIXES lib64 lib lib/32 lib/64 |
|
419 PATHS |
|
420 ~/Library/Frameworks |
|
421 /Library/Frameworks |
|
422 - /usr/local |
|
423 +# Uncomment the following to enable /usr/local search |
|
424 +# /usr/local |
|
425 /usr |
|
426 /sw |
|
427 /opt/local |
|
428 - /opt/csw |
|
429 +# Uncomment the following to enable /opt/csw search |
|
430 +# /opt/csw |
|
431 /opt |
|
432 ) |
|
433 |
|
434 diff -ru cmake-2.8.6.org//Modules/FindMatlab.cmake cmake-2.8.6/Modules/FindMatlab.cmake |
|
435 --- cmake-2.8.6.org//Modules/FindMatlab.cmake Tue Oct 4 09:09:24 2011 |
|
436 +++ cmake-2.8.6/Modules/FindMatlab.cmake Mon Oct 10 17:00:16 2011 |
|
437 @@ -60,7 +60,8 @@ |
|
438 IF(CMAKE_SIZEOF_VOID_P EQUAL 4) |
|
439 # Regular x86 |
|
440 SET(MATLAB_ROOT |
|
441 - /usr/local/matlab-7sp1/bin/glnx86/ |
|
442 +# Uncomment the following to enable /usr/local search |
|
443 +# /usr/local/matlab-7sp1/bin/glnx86/ |
|
444 /opt/matlab-7sp1/bin/glnx86/ |
|
445 $ENV{HOME}/matlab-7sp1/bin/glnx86/ |
|
446 $ENV{HOME}/redhat-matlab/bin/glnx86/ |
|
447 @@ -68,7 +69,8 @@ |
|
448 ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4) |
|
449 # AMD64: |
|
450 SET(MATLAB_ROOT |
|
451 - /usr/local/matlab-7sp1/bin/glnxa64/ |
|
452 +# Uncomment the following to enable /usr/local search |
|
453 +# /usr/local/matlab-7sp1/bin/glnxa64/ |
|
454 /opt/matlab-7sp1/bin/glnxa64/ |
|
455 $ENV{HOME}/matlab7_64/bin/glnxa64/ |
|
456 $ENV{HOME}/matlab-7sp1/bin/glnxa64/ |
|
457 @@ -89,7 +91,8 @@ |
|
458 ) |
|
459 FIND_PATH(MATLAB_INCLUDE_DIR |
|
460 "mex.h" |
|
461 - "/usr/local/matlab-7sp1/extern/include/" |
|
462 +# Uncomment the following to enable /usr/local search |
|
463 +# "/usr/local/matlab-7sp1/extern/include/" |
|
464 "/opt/matlab-7sp1/extern/include/" |
|
465 "$ENV{HOME}/matlab-7sp1/extern/include/" |
|
466 "$ENV{HOME}/redhat-matlab/extern/include/" |
|
467 diff -ru cmake-2.8.6.org//Modules/FindOpenAL.cmake cmake-2.8.6/Modules/FindOpenAL.cmake |
|
468 --- cmake-2.8.6.org//Modules/FindOpenAL.cmake Tue Oct 4 09:09:24 2011 |
|
469 +++ cmake-2.8.6/Modules/FindOpenAL.cmake Tue Oct 11 11:06:21 2011 |
|
470 @@ -68,11 +68,13 @@ |
|
471 PATHS |
|
472 ~/Library/Frameworks |
|
473 /Library/Frameworks |
|
474 - /usr/local |
|
475 +# Uncomment the following to enable /usr/local search |
|
476 +# /usr/local |
|
477 /usr |
|
478 /sw # Fink |
|
479 /opt/local # DarwinPorts |
|
480 - /opt/csw # Blastwave |
|
481 +# Uncomment the following to enable /opt/csw search |
|
482 +# /opt/csw # Blastwave |
|
483 /opt |
|
484 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] |
|
485 ) |
|
486 @@ -81,15 +83,17 @@ |
|
487 NAMES OpenAL al openal OpenAL32 |
|
488 HINTS |
|
489 $ENV{OPENALDIR} |
|
490 - PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 |
|
491 + PATH_SUFFIXES lib64 lib lib/32 lib/64 libs64 libs libs/Win32 libs/Win64 |
|
492 PATHS |
|
493 ~/Library/Frameworks |
|
494 /Library/Frameworks |
|
495 - /usr/local |
|
496 +# Uncomment the following to enable /usr/local search |
|
497 +# /usr/local |
|
498 /usr |
|
499 /sw |
|
500 /opt/local |
|
501 - /opt/csw |
|
502 +# Uncomment the following to enable /opt/csw search |
|
503 +# /opt/csw |
|
504 /opt |
|
505 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] |
|
506 ) |
|
507 diff -ru cmake-2.8.6.org//Modules/FindOpenThreads.cmake cmake-2.8.6/Modules/FindOpenThreads.cmake |
|
508 --- cmake-2.8.6.org//Modules/FindOpenThreads.cmake Tue Oct 4 09:09:24 2011 |
|
509 +++ cmake-2.8.6/Modules/FindOpenThreads.cmake Mon Oct 10 17:06:24 2011 |
|
510 @@ -64,7 +64,8 @@ |
|
511 PATHS |
|
512 /sw # Fink |
|
513 /opt/local # DarwinPorts |
|
514 - /opt/csw # Blastwave |
|
515 +# Uncomment the following to enable /opt/csw search |
|
516 +# /opt/csw # Blastwave |
|
517 /opt |
|
518 /usr/freeware |
|
519 PATH_SUFFIXES include |
|
520 @@ -84,7 +85,8 @@ |
|
521 PATHS |
|
522 /sw |
|
523 /opt/local |
|
524 - /opt/csw |
|
525 +# Uncomment the following to enable /opt/csw search |
|
526 +# /opt/csw |
|
527 /opt |
|
528 /usr/freeware |
|
529 PATH_SUFFIXES lib64 lib |
|
530 @@ -104,7 +106,8 @@ |
|
531 PATHS |
|
532 /sw |
|
533 /opt/local |
|
534 - /opt/csw |
|
535 +# Uncomment the following to enable /opt/csw search |
|
536 +# /opt/csw |
|
537 /opt |
|
538 /usr/freeware |
|
539 PATH_SUFFIXES lib64 lib |
|
540 diff -ru cmake-2.8.6.org//Modules/FindPHP4.cmake cmake-2.8.6/Modules/FindPHP4.cmake |
|
541 --- cmake-2.8.6.org//Modules/FindPHP4.cmake Tue Oct 4 09:09:24 2011 |
|
542 +++ cmake-2.8.6/Modules/FindPHP4.cmake Mon Oct 10 17:07:51 2011 |
|
543 @@ -22,10 +22,12 @@ |
|
544 |
|
545 SET(PHP4_POSSIBLE_INCLUDE_PATHS |
|
546 /usr/include/php4 |
|
547 - /usr/local/include/php4 |
|
548 +# Uncomment the following to enable /usr/local search |
|
549 +# /usr/local/include/php4 |
|
550 /usr/include/php |
|
551 - /usr/local/include/php |
|
552 - /usr/local/apache/php |
|
553 +# Uncomment the following to enable /usr/local search |
|
554 +# /usr/local/include/php |
|
555 +# /usr/local/apache/php |
|
556 ) |
|
557 |
|
558 SET(PHP4_POSSIBLE_LIB_PATHS |
|
559 diff -ru cmake-2.8.6.org//Modules/FindPhysFS.cmake cmake-2.8.6/Modules/FindPhysFS.cmake |
|
560 --- cmake-2.8.6.org//Modules/FindPhysFS.cmake Tue Oct 4 09:09:24 2011 |
|
561 +++ cmake-2.8.6/Modules/FindPhysFS.cmake Tue Oct 11 11:06:49 2011 |
|
562 @@ -30,7 +30,8 @@ |
|
563 PATHS |
|
564 ~/Library/Frameworks |
|
565 /Library/Frameworks |
|
566 - /usr/local |
|
567 +# Uncomment the following to enable /usr/local search |
|
568 +# /usr/local |
|
569 /usr |
|
570 /sw # Fink |
|
571 /opt/local # DarwinPorts |
|
572 @@ -42,11 +43,12 @@ |
|
573 NAMES physfs |
|
574 HINTS |
|
575 $ENV{PHYSFSDIR} |
|
576 - PATH_SUFFIXES lib64 lib |
|
577 + PATH_SUFFIXES lib64 lib lib/32 lib/64 |
|
578 PATHS |
|
579 ~/Library/Frameworks |
|
580 /Library/Frameworks |
|
581 - /usr/local |
|
582 +# Uncomment the following to enable /usr/local search |
|
583 +# /usr/local |
|
584 /usr |
|
585 /sw |
|
586 /opt/local |
|
587 diff -ru cmake-2.8.6.org//Modules/FindPike.cmake cmake-2.8.6/Modules/FindPike.cmake |
|
588 --- cmake-2.8.6.org//Modules/FindPike.cmake Tue Oct 4 09:09:24 2011 |
|
589 +++ cmake-2.8.6/Modules/FindPike.cmake Mon Oct 10 17:09:13 2011 |
|
590 @@ -22,7 +22,9 @@ |
|
591 |
|
592 FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS |
|
593 /usr/include/pike/* |
|
594 - /usr/local/include/pike/*) |
|
595 +# Uncomment the following to enable /usr/local search |
|
596 +# /usr/local/include/pike/*) |
|
597 + ) |
|
598 |
|
599 FIND_PATH(PIKE_INCLUDE_PATH program.h |
|
600 ${PIKE_POSSIBLE_INCLUDE_PATHS}) |
|
601 diff -ru cmake-2.8.6.org//Modules/FindProducer.cmake cmake-2.8.6/Modules/FindProducer.cmake |
|
602 --- cmake-2.8.6.org//Modules/FindProducer.cmake Tue Oct 4 09:09:24 2011 |
|
603 +++ cmake-2.8.6/Modules/FindProducer.cmake Tue Oct 11 11:07:52 2011 |
|
604 @@ -51,11 +51,13 @@ |
|
605 PATHS |
|
606 ~/Library/Frameworks |
|
607 /Library/Frameworks |
|
608 - /usr/local/include |
|
609 +# Uncomment the following to enable /usr/local search |
|
610 +# /usr/local/include |
|
611 /usr/include |
|
612 /sw/include # Fink |
|
613 /opt/local/include # DarwinPorts |
|
614 - /opt/csw/include # Blastwave |
|
615 +# Uncomment the following to enable /opt/csw search |
|
616 +# /opt/csw/include # Blastwave |
|
617 /opt/include |
|
618 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include |
|
619 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include |
|
620 @@ -67,13 +69,15 @@ |
|
621 $ENV{PRODUCER_DIR} |
|
622 $ENV{OSG_DIR} |
|
623 $ENV{OSGDIR} |
|
624 - PATH_SUFFIXES lib64 lib |
|
625 + PATH_SUFFIXES lib64 lib lib/32 lib/64 |
|
626 PATHS |
|
627 - /usr/local |
|
628 +# Uncomment the following to enable /usr/local search |
|
629 +# /usr/local |
|
630 /usr |
|
631 /sw |
|
632 /opt/local |
|
633 - /opt/csw |
|
634 +# Uncomment the following to enable /opt/csw search |
|
635 +# /opt/csw |
|
636 /opt |
|
637 ) |
|
638 |
|
639 diff -ru cmake-2.8.6.org//Modules/FindQt.cmake cmake-2.8.6/Modules/FindQt.cmake |
|
640 --- cmake-2.8.6.org//Modules/FindQt.cmake Tue Oct 4 09:09:24 2011 |
|
641 +++ cmake-2.8.6/Modules/FindQt.cmake Tue Oct 11 10:08:04 2011 |
|
642 @@ -82,8 +82,9 @@ |
|
643 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" |
|
644 ${qt_headers}/Qt |
|
645 $ENV{QTDIR}/include/Qt |
|
646 - /usr/local/qt/include/Qt |
|
647 - /usr/local/include/Qt |
|
648 +# Uncomment the following to enable /usr/local search |
|
649 +# /usr/local/qt/include/Qt |
|
650 +# /usr/local/include/Qt |
|
651 /usr/lib/qt/include/Qt |
|
652 /usr/include/Qt |
|
653 /usr/share/qt4/include/Qt |
|
654 @@ -101,8 +102,9 @@ |
|
655 C:/Qt/3.3.3Educational/include |
|
656 $ENV{QTDIR}/include |
|
657 /usr/include/qt3/Qt |
|
658 - /usr/local/qt/include |
|
659 - /usr/local/include |
|
660 +# Uncomment the following to enable /usr/local search |
|
661 +# /usr/local/qt/include |
|
662 +# /usr/local/include |
|
663 /usr/lib/qt/include |
|
664 /usr/include |
|
665 /usr/share/qt3/include |
|
666 diff -ru cmake-2.8.6.org//Modules/FindQt3.cmake cmake-2.8.6/Modules/FindQt3.cmake |
|
667 --- cmake-2.8.6.org//Modules/FindQt3.cmake Tue Oct 4 09:09:24 2011 |
|
668 +++ cmake-2.8.6/Modules/FindQt3.cmake Tue Oct 11 10:08:58 2011 |
|
669 @@ -53,7 +53,8 @@ |
|
670 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
|
671 $ENV{QTDIR}/include |
|
672 ${GLOB_PATHS_BIN} |
|
673 - /usr/local/qt/include |
|
674 +# Uncomment the following to enable /usr/local search |
|
675 +# /usr/local/qt/include |
|
676 /usr/lib/qt/include |
|
677 /usr/lib/qt3/include |
|
678 /usr/include/qt |
|
679 @@ -91,7 +92,8 @@ |
|
680 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" |
|
681 $ENV{QTDIR}/lib |
|
682 ${GLOB_PATHS_LIB} |
|
683 - /usr/local/qt/lib |
|
684 +# Uncomment the following to enable /usr/local search |
|
685 +# /usr/local/qt/lib |
|
686 /usr/lib/qt/lib |
|
687 /usr/lib/qt3/lib |
|
688 /usr/lib/qt3/lib64 |
|
689 @@ -111,7 +113,8 @@ |
|
690 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" |
|
691 $ENV{QTDIR}/lib |
|
692 ${GLOB_PATHS_LIB} |
|
693 - /usr/local/qt/lib |
|
694 +# Uncomment the following to enable /usr/local search |
|
695 +# /usr/local/qt/lib |
|
696 /usr/lib/qt/lib |
|
697 /usr/lib/qt3/lib |
|
698 /usr/lib/qt3/lib64 |
|
699 @@ -129,7 +132,8 @@ |
|
700 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" |
|
701 $ENV{QTDIR}/lib |
|
702 ${GLOB_PATHS_LIB} |
|
703 - /usr/local/qt/lib |
|
704 +# Uncomment the following to enable /usr/local search |
|
705 +# /usr/local/qt/lib |
|
706 /usr/lib/qt3/lib |
|
707 /usr/lib/qt3/lib64 |
|
708 /usr/share/qt3/lib |
|
709 @@ -147,7 +151,8 @@ |
|
710 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
|
711 $ENV{QTDIR}/bin |
|
712 ${GLOB_PATHS_BIN} |
|
713 - /usr/local/qt/bin |
|
714 +# Uncomment the following to enable /usr/local search |
|
715 +# /usr/local/qt/bin |
|
716 /usr/lib/qt/bin |
|
717 /usr/lib/qt3/bin |
|
718 /usr/share/qt3/bin |
|
719 @@ -169,7 +174,8 @@ |
|
720 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" |
|
721 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
|
722 ${GLOB_PATHS_BIN} |
|
723 - /usr/local/qt/bin |
|
724 +# Uncomment the following to enable /usr/local search |
|
725 +# /usr/local/qt/bin |
|
726 /usr/lib/qt/bin |
|
727 /usr/lib/qt3/bin |
|
728 /usr/share/qt3/bin |
|
729 diff -ru cmake-2.8.6.org//Modules/FindSDL.cmake cmake-2.8.6/Modules/FindSDL.cmake |
|
730 --- cmake-2.8.6.org//Modules/FindSDL.cmake Tue Oct 4 09:09:24 2011 |
|
731 +++ cmake-2.8.6/Modules/FindSDL.cmake Tue Oct 11 10:09:48 2011 |
|
732 @@ -72,13 +72,15 @@ |
|
733 PATHS |
|
734 ~/Library/Frameworks |
|
735 /Library/Frameworks |
|
736 - /usr/local/include/SDL12 |
|
737 - /usr/local/include/SDL11 # FreeBSD ports |
|
738 +# Uncomment the following to enable /usr/local search |
|
739 +# /usr/local/include/SDL12 |
|
740 +# /usr/local/include/SDL11 # FreeBSD ports |
|
741 /usr/include/SDL12 |
|
742 /usr/include/SDL11 |
|
743 /sw # Fink |
|
744 /opt/local # DarwinPorts |
|
745 - /opt/csw # Blastwave |
|
746 +# Uncomment the following to enable /usr/local search |
|
747 +# /opt/csw # Blastwave |
|
748 /opt |
|
749 ) |
|
750 #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") |
|
751 @@ -93,7 +95,8 @@ |
|
752 PATHS |
|
753 /sw |
|
754 /opt/local |
|
755 - /opt/csw |
|
756 +# Uncomment the following to enable /opt/csw search |
|
757 +# /opt/csw |
|
758 /opt |
|
759 ) |
|
760 |
|
761 @@ -113,7 +116,8 @@ |
|
762 PATHS |
|
763 /sw |
|
764 /opt/local |
|
765 - /opt/csw |
|
766 +# Uncomment the following to enable /opt/csw search |
|
767 +# /opt/csw |
|
768 /opt |
|
769 ) |
|
770 ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") |
|
771 diff -ru cmake-2.8.6.org//Modules/FindSDL_image.cmake cmake-2.8.6/Modules/FindSDL_image.cmake |
|
772 --- cmake-2.8.6.org//Modules/FindSDL_image.cmake Tue Oct 4 09:09:24 2011 |
|
773 +++ cmake-2.8.6/Modules/FindSDL_image.cmake Tue Oct 11 10:10:36 2011 |
|
774 @@ -33,20 +33,24 @@ |
|
775 PATHS |
|
776 ~/Library/Frameworks |
|
777 /Library/Frameworks |
|
778 - /usr/local/include/SDL |
|
779 +# Uncomment the following to enable /usr/local search |
|
780 +# /usr/local/include/SDL |
|
781 /usr/include/SDL |
|
782 - /usr/local/include/SDL12 |
|
783 - /usr/local/include/SDL11 # FreeBSD ports |
|
784 +# Uncomment the following to enable /usr/local search |
|
785 +# /usr/local/include/SDL12 |
|
786 +# /usr/local/include/SDL11 # FreeBSD ports |
|
787 /usr/include/SDL12 |
|
788 /usr/include/SDL11 |
|
789 - /usr/local/include |
|
790 +# Uncomment the following to enable /usr/local search |
|
791 +# /usr/local/include |
|
792 /usr/include |
|
793 /sw/include/SDL # Fink |
|
794 /sw/include |
|
795 /opt/local/include/SDL # DarwinPorts |
|
796 /opt/local/include |
|
797 - /opt/csw/include/SDL # Blastwave |
|
798 - /opt/csw/include |
|
799 +# Uncomment the following to enable /opt/csw search |
|
800 +# /opt/csw/include/SDL # Blastwave |
|
801 +# /opt/csw/include |
|
802 /opt/include/SDL |
|
803 /opt/include |
|
804 ) |
|
805 @@ -60,11 +64,13 @@ |
|
806 PATHS |
|
807 ~/Library/Frameworks |
|
808 /Library/Frameworks |
|
809 - /usr/local |
|
810 +# Uncomment the following to enable /usr/local search |
|
811 +# /usr/local |
|
812 /usr |
|
813 /sw |
|
814 /opt/local |
|
815 - /opt/csw |
|
816 +# Uncomment the following to enable /opt/csw search |
|
817 +# /opt/csw |
|
818 /opt |
|
819 ) |
|
820 |
|
821 diff -ru cmake-2.8.6.org//Modules/FindSDL_mixer.cmake cmake-2.8.6/Modules/FindSDL_mixer.cmake |
|
822 --- cmake-2.8.6.org//Modules/FindSDL_mixer.cmake Tue Oct 4 09:09:24 2011 |
|
823 +++ cmake-2.8.6/Modules/FindSDL_mixer.cmake Tue Oct 11 11:09:06 2011 |
|
824 @@ -33,20 +33,24 @@ |
|
825 PATHS |
|
826 ~/Library/Frameworks |
|
827 /Library/Frameworks |
|
828 - /usr/local/include/SDL |
|
829 +# Uncomment the following to enable /usr/local search |
|
830 +# /usr/local/include/SDL |
|
831 /usr/include/SDL |
|
832 - /usr/local/include/SDL12 |
|
833 - /usr/local/include/SDL11 # FreeBSD ports |
|
834 +# Uncomment the following to enable /usr/local search |
|
835 +# /usr/local/include/SDL12 |
|
836 +# /usr/local/include/SDL11 # FreeBSD ports |
|
837 /usr/include/SDL12 |
|
838 /usr/include/SDL11 |
|
839 - /usr/local/include |
|
840 +# Uncomment the following to enable /usr/local search |
|
841 +# /usr/local/include |
|
842 /usr/include |
|
843 /sw/include/SDL # Fink |
|
844 /sw/include |
|
845 /opt/local/include/SDL # DarwinPorts |
|
846 /opt/local/include |
|
847 - /opt/csw/include/SDL # Blastwave |
|
848 - /opt/csw/include |
|
849 +# Uncomment the following to enable /opt/csw search |
|
850 +# /opt/csw/include/SDL # Blastwave |
|
851 +# /opt/csw/include |
|
852 /opt/include/SDL |
|
853 /opt/include |
|
854 ) |
|
855 @@ -56,15 +60,17 @@ |
|
856 HINTS |
|
857 $ENV{SDLMIXERDIR} |
|
858 $ENV{SDLDIR} |
|
859 - PATH_SUFFIXES lib64 lib |
|
860 + PATH_SUFFIXES lib64 lib lib/32 lib/64 |
|
861 PATHS |
|
862 ~/Library/Frameworks |
|
863 /Library/Frameworks |
|
864 - /usr/local |
|
865 +# Uncomment the following to enable /usr/local search |
|
866 +# /usr/local |
|
867 /usr |
|
868 /sw |
|
869 /opt/local |
|
870 - /opt/csw |
|
871 +# Uncomment the following to enable /opt/csw search |
|
872 +# /opt/csw |
|
873 /opt |
|
874 ) |
|
875 |
|
876 diff -ru cmake-2.8.6.org//Modules/FindSDL_net.cmake cmake-2.8.6/Modules/FindSDL_net.cmake |
|
877 --- cmake-2.8.6.org//Modules/FindSDL_net.cmake Tue Oct 4 09:09:24 2011 |
|
878 +++ cmake-2.8.6/Modules/FindSDL_net.cmake Tue Oct 11 11:10:06 2011 |
|
879 @@ -33,20 +33,24 @@ |
|
880 PATHS |
|
881 ~/Library/Frameworks |
|
882 /Library/Frameworks |
|
883 - /usr/local/include/SDL |
|
884 +# Uncomment the following to enable /usr/local search |
|
885 +# /usr/local/include/SDL |
|
886 /usr/include/SDL |
|
887 - /usr/local/include/SDL12 |
|
888 - /usr/local/include/SDL11 # FreeBSD ports |
|
889 +# Uncomment the following to enable /usr/local search |
|
890 +# /usr/local/include/SDL12 |
|
891 +# /usr/local/include/SDL11 # FreeBSD ports |
|
892 /usr/include/SDL12 |
|
893 /usr/include/SDL11 |
|
894 - /usr/local/include |
|
895 +# Uncomment the following to enable /usr/local search |
|
896 +# /usr/local/include |
|
897 /usr/include |
|
898 /sw/include/SDL # Fink |
|
899 /sw/include |
|
900 /opt/local/include/SDL # DarwinPorts |
|
901 /opt/local/include |
|
902 - /opt/csw/include/SDL # Blastwave |
|
903 - /opt/csw/include |
|
904 +# Uncomment the following to enable /opt/csw search |
|
905 +# /opt/csw/include/SDL # Blastwave |
|
906 +# /opt/csw/include |
|
907 /opt/include/SDL |
|
908 /opt/include |
|
909 ) |
|
910 @@ -55,15 +59,17 @@ |
|
911 HINTS |
|
912 $ENV{SDLNETDIR} |
|
913 $ENV{SDLDIR} |
|
914 - PATH_SUFFIXES lib64 lib |
|
915 + PATH_SUFFIXES lib64 lib lib/32 lib/64 |
|
916 PATHS |
|
917 ~/Library/Frameworks |
|
918 /Library/Frameworks |
|
919 - /usr/local |
|
920 +# Uncomment the following to enable /usr/local search |
|
921 +# /usr/local |
|
922 /usr |
|
923 /sw |
|
924 /opt/local |
|
925 - /opt/csw |
|
926 +# Uncomment the following to enable /opt/csw search |
|
927 +# /opt/csw |
|
928 /opt |
|
929 ) |
|
930 |
|
931 diff -ru cmake-2.8.6.org//Modules/FindSDL_sound.cmake cmake-2.8.6/Modules/FindSDL_sound.cmake |
|
932 --- cmake-2.8.6.org//Modules/FindSDL_sound.cmake Tue Oct 4 09:09:24 2011 |
|
933 +++ cmake-2.8.6/Modules/FindSDL_sound.cmake Tue Oct 11 10:15:08 2011 |
|
934 @@ -80,20 +80,24 @@ |
|
935 $ENV{SDLDIR}/include |
|
936 $ENV{SDLDIR} |
|
937 PATHS |
|
938 - /usr/local/include/SDL |
|
939 +# Uncomment the following to enable /usr/local search |
|
940 +# /usr/local/include/SDL |
|
941 /usr/include/SDL |
|
942 - /usr/local/include/SDL12 |
|
943 - /usr/local/include/SDL11 # FreeBSD ports |
|
944 +# Uncomment the following to enable /usr/local search |
|
945 +# /usr/local/include/SDL12 |
|
946 +# /usr/local/include/SDL11 # FreeBSD ports |
|
947 /usr/include/SDL12 |
|
948 /usr/include/SDL11 |
|
949 - /usr/local/include |
|
950 +# Uncomment the following to enable /usr/local search |
|
951 +# /usr/local/include |
|
952 /usr/include |
|
953 /sw/include/SDL # Fink |
|
954 /sw/include |
|
955 /opt/local/include/SDL # DarwinPorts |
|
956 /opt/local/include |
|
957 - /opt/csw/include/SDL # Blastwave |
|
958 - /opt/csw/include |
|
959 +# Uncomment the following to enable /opt/csw search |
|
960 +# /opt/csw/include/SDL # Blastwave |
|
961 +# /opt/csw/include |
|
962 /opt/include/SDL |
|
963 /opt/include |
|
964 ) |
|
965 @@ -106,11 +110,13 @@ |
|
966 $ENV{SDLDIR}/lib |
|
967 $ENV{SDLDIR} |
|
968 PATHS |
|
969 - /usr/local/lib |
|
970 +# Uncomment the following to enable /usr/local search |
|
971 +# /usr/local/lib |
|
972 /usr/lib |
|
973 /sw/lib |
|
974 /opt/local/lib |
|
975 - /opt/csw/lib |
|
976 +# Uncomment the following to enable /opt/csw search |
|
977 +# /opt/csw/lib |
|
978 /opt/lib |
|
979 ) |
|
980 |
|
981 @@ -223,11 +229,13 @@ |
|
982 $ENV{SDLSOUNDDIR} |
|
983 $ENV{SDLDIR}/lib |
|
984 $ENV{SDLDIR} |
|
985 - /usr/local/lib |
|
986 +# Uncomment the following to enable /usr/local search |
|
987 +# /usr/local/lib |
|
988 /usr/lib |
|
989 /sw/lib |
|
990 /opt/local/lib |
|
991 - /opt/csw/lib |
|
992 +# Uncomment the following to enable /opt/csw search |
|
993 +# /opt/csw/lib |
|
994 /opt/lib |
|
995 ) |
|
996 IF(MIKMOD_LIBRARY) |
|
997 @@ -246,11 +254,13 @@ |
|
998 $ENV{SDLSOUNDDIR} |
|
999 $ENV{SDLDIR}/lib |
|
1000 $ENV{SDLDIR} |
|
1001 - /usr/local/lib |
|
1002 +# Uncomment the following to enable /usr/local search |
|
1003 +# /usr/local/lib |
|
1004 /usr/lib |
|
1005 /sw/lib |
|
1006 /opt/local/lib |
|
1007 - /opt/csw/lib |
|
1008 +# Uncomment the following to enable /opt/csw search |
|
1009 +# /opt/csw/lib |
|
1010 /opt/lib |
|
1011 ) |
|
1012 IF(MODPLUG_LIBRARY) |
|
1013 @@ -272,11 +282,13 @@ |
|
1014 $ENV{SDLSOUNDDIR} |
|
1015 $ENV{SDLDIR}/lib |
|
1016 $ENV{SDLDIR} |
|
1017 - /usr/local/lib |
|
1018 +# Uncomment the following to enable /usr/local search |
|
1019 +# /usr/local/lib |
|
1020 /usr/lib |
|
1021 /sw/lib |
|
1022 /opt/local/lib |
|
1023 - /opt/csw/lib |
|
1024 +# Uncomment the following to enable /opt/csw search |
|
1025 +# /opt/csw/lib |
|
1026 /opt/lib |
|
1027 ) |
|
1028 IF(VORBIS_LIBRARY) |
|
1029 @@ -294,11 +306,13 @@ |
|
1030 $ENV{SDLSOUNDDIR} |
|
1031 $ENV{SDLDIR}/lib |
|
1032 $ENV{SDLDIR} |
|
1033 - /usr/local/lib |
|
1034 +# Uncomment the following to enable /usr/local search |
|
1035 +# /usr/local/lib |
|
1036 /usr/lib |
|
1037 /sw/lib |
|
1038 /opt/local/lib |
|
1039 - /opt/csw/lib |
|
1040 +# Uncomment the following to enable /opt/csw search |
|
1041 +# /opt/csw/lib |
|
1042 /opt/lib |
|
1043 ) |
|
1044 IF(OGG_LIBRARY) |
|
1045 @@ -318,11 +332,13 @@ |
|
1046 $ENV{SDLSOUNDDIR} |
|
1047 $ENV{SDLDIR}/lib |
|
1048 $ENV{SDLDIR} |
|
1049 - /usr/local/lib |
|
1050 +# Uncomment the following to enable /usr/local search |
|
1051 +# /usr/local/lib |
|
1052 /usr/lib |
|
1053 /sw/lib |
|
1054 /opt/local/lib |
|
1055 - /opt/csw/lib |
|
1056 +# Uncomment the following to enable /opt/csw search |
|
1057 +# /opt/csw/lib |
|
1058 /opt/lib |
|
1059 ) |
|
1060 IF(SMPEG_LIBRARY) |
|
1061 @@ -342,11 +358,13 @@ |
|
1062 $ENV{SDLSOUNDDIR} |
|
1063 $ENV{SDLDIR}/lib |
|
1064 $ENV{SDLDIR} |
|
1065 - /usr/local/lib |
|
1066 +# Uncomment the following to enable /usr/local search |
|
1067 +# /usr/local/lib |
|
1068 /usr/lib |
|
1069 /sw/lib |
|
1070 /opt/local/lib |
|
1071 - /opt/csw/lib |
|
1072 +# Uncomment the following to enable /opt/csw search |
|
1073 +# /opt/csw/lib |
|
1074 /opt/lib |
|
1075 ) |
|
1076 IF(FLAC_LIBRARY) |
|
1077 @@ -369,11 +387,13 @@ |
|
1078 $ENV{SDLSOUNDDIR} |
|
1079 $ENV{SDLDIR}/lib |
|
1080 $ENV{SDLDIR} |
|
1081 - /usr/local/lib |
|
1082 +# Uncomment the following to enable /usr/local search |
|
1083 +# /usr/local/lib |
|
1084 /usr/lib |
|
1085 /sw/lib |
|
1086 /opt/local/lib |
|
1087 - /opt/csw/lib |
|
1088 +# Uncomment the following to enable /opt/csw search |
|
1089 +# /opt/csw/lib |
|
1090 /opt/lib |
|
1091 ) |
|
1092 IF(SPEEX_LIBRARY) |
|
1093 @@ -396,11 +416,13 @@ |
|
1094 $ENV{SDLSOUNDDIR} |
|
1095 $ENV{SDLDIR}/lib |
|
1096 $ENV{SDLDIR} |
|
1097 - /usr/local/lib |
|
1098 +# Uncomment the following to enable /usr/local search |
|
1099 +# /usr/local/lib |
|
1100 /usr/lib |
|
1101 /sw/lib |
|
1102 /opt/local/lib |
|
1103 - /opt/csw/lib |
|
1104 +# Uncomment the following to enable /opt/csw search |
|
1105 +# /opt/csw/lib |
|
1106 /opt/lib |
|
1107 ) |
|
1108 IF(OGG_LIBRARY) |
|
1109 diff -ru cmake-2.8.6.org//Modules/FindSDL_ttf.cmake cmake-2.8.6/Modules/FindSDL_ttf.cmake |
|
1110 --- cmake-2.8.6.org//Modules/FindSDL_ttf.cmake Tue Oct 4 09:09:24 2011 |
|
1111 +++ cmake-2.8.6/Modules/FindSDL_ttf.cmake Tue Oct 11 10:15:50 2011 |
|
1112 @@ -33,20 +33,24 @@ |
|
1113 PATHS |
|
1114 ~/Library/Frameworks |
|
1115 /Library/Frameworks |
|
1116 - /usr/local/include/SDL |
|
1117 +# Uncomment the following to enable /usr/local search |
|
1118 +# /usr/local/include/SDL |
|
1119 /usr/include/SDL |
|
1120 - /usr/local/include/SDL12 |
|
1121 - /usr/local/include/SDL11 # FreeBSD ports |
|
1122 +# Uncomment the following to enable /usr/local search |
|
1123 +# /usr/local/include/SDL12 |
|
1124 +# /usr/local/include/SDL11 # FreeBSD ports |
|
1125 /usr/include/SDL12 |
|
1126 /usr/include/SDL11 |
|
1127 - /usr/local/include |
|
1128 +# Uncomment the following to enable /usr/local search |
|
1129 +# /usr/local/include |
|
1130 /usr/include |
|
1131 /sw/include/SDL # Fink |
|
1132 /sw/include |
|
1133 /opt/local/include/SDL # DarwinPorts |
|
1134 /opt/local/include |
|
1135 - /opt/csw/include/SDL # Blastwave |
|
1136 - /opt/csw/include |
|
1137 +# Uncomment the following to enable /opt/csw search |
|
1138 +# /opt/csw/include/SDL # Blastwave |
|
1139 +# /opt/csw/include |
|
1140 /opt/include/SDL |
|
1141 /opt/include |
|
1142 ) |
|
1143 @@ -59,11 +63,13 @@ |
|
1144 PATHS |
|
1145 ~/Library/Frameworks |
|
1146 /Library/Frameworks |
|
1147 - /usr/local |
|
1148 +# Uncomment the following to enable /usr/local search |
|
1149 +# /usr/local |
|
1150 /usr |
|
1151 /sw |
|
1152 /opt/local |
|
1153 - /opt/csw |
|
1154 +# Uncomment the following to enable /opt/csw search |
|
1155 +# /opt/csw |
|
1156 /opt |
|
1157 PATH_SUFFIXES lib64 lib |
|
1158 ) |
|
1159 diff -ru cmake-2.8.6.org//Modules/FindSelfPackers.cmake cmake-2.8.6/Modules/FindSelfPackers.cmake |
|
1160 --- cmake-2.8.6.org//Modules/FindSelfPackers.cmake Tue Oct 4 09:09:24 2011 |
|
1161 +++ cmake-2.8.6/Modules/FindSelfPackers.cmake Tue Oct 11 10:16:10 2011 |
|
1162 @@ -25,7 +25,8 @@ |
|
1163 ${CYGWIN_INSTALL_PATH}/bin |
|
1164 /bin |
|
1165 /usr/bin |
|
1166 - /usr/local/bin |
|
1167 +# Uncomment the following to enable /usr/local search |
|
1168 +# /usr/local/bin |
|
1169 /sbin |
|
1170 ) |
|
1171 |
|
1172 @@ -34,7 +35,8 @@ |
|
1173 ${CYGWIN_INSTALL_PATH}/bin |
|
1174 /bin |
|
1175 /usr/bin |
|
1176 - /usr/local/bin |
|
1177 +# Uncomment the following to enable /usr/local search |
|
1178 +# /usr/local/bin |
|
1179 /sbin |
|
1180 ) |
|
1181 |
|
1182 diff -ru cmake-2.8.6.org//Modules/FindTCL.cmake cmake-2.8.6/Modules/FindTCL.cmake |
|
1183 --- cmake-2.8.6.org//Modules/FindTCL.cmake Tue Oct 4 09:09:24 2011 |
|
1184 +++ cmake-2.8.6/Modules/FindTCL.cmake Tue Oct 11 10:17:12 2011 |
|
1185 @@ -79,7 +79,8 @@ |
|
1186 "${TCL_TCLSH_PATH_PARENT}/lib" |
|
1187 "${TK_WISH_PATH_PARENT}/lib" |
|
1188 /usr/lib |
|
1189 - /usr/local/lib |
|
1190 +# Uncomment the following to enable /usr/local search |
|
1191 +# /usr/local/lib |
|
1192 ) |
|
1193 |
|
1194 IF(WIN32) |
|
1195 @@ -159,7 +160,8 @@ |
|
1196 "${TCL_TCLSH_PATH_PARENT}/include" |
|
1197 "${TK_WISH_PATH_PARENT}/include" |
|
1198 /usr/include |
|
1199 - /usr/local/include |
|
1200 +# Uncomment the following to enable /usr/local search |
|
1201 +# /usr/local/include |
|
1202 /usr/include/tcl${TK_LIBRARY_VERSION} |
|
1203 /usr/include/tcl${TCL_LIBRARY_VERSION} |
|
1204 /usr/include/tcl8.6 |
|
1205 diff -ru cmake-2.8.6.org//Modules/FindTclStub.cmake cmake-2.8.6/Modules/FindTclStub.cmake |
|
1206 --- cmake-2.8.6.org//Modules/FindTclStub.cmake Tue Oct 4 09:09:24 2011 |
|
1207 +++ cmake-2.8.6/Modules/FindTclStub.cmake Tue Oct 11 10:17:24 2011 |
|
1208 @@ -67,7 +67,8 @@ |
|
1209 "${TCL_TCLSH_PATH_PARENT}/lib" |
|
1210 "${TK_WISH_PATH_PARENT}/lib" |
|
1211 /usr/lib |
|
1212 - /usr/local/lib |
|
1213 +# Uncomment the following to enable /usr/local search |
|
1214 +# /usr/local/lib |
|
1215 ) |
|
1216 |
|
1217 IF(WIN32) |
|
1218 diff -ru cmake-2.8.6.org//Modules/FindUnixCommands.cmake cmake-2.8.6/Modules/FindUnixCommands.cmake |
|
1219 --- cmake-2.8.6.org//Modules/FindUnixCommands.cmake Tue Oct 4 09:09:24 2011 |
|
1220 +++ cmake-2.8.6/Modules/FindUnixCommands.cmake Tue Oct 11 10:17:56 2011 |
|
1221 @@ -22,7 +22,8 @@ |
|
1222 ${CYGWIN_INSTALL_PATH}/bin |
|
1223 /bin |
|
1224 /usr/bin |
|
1225 - /usr/local/bin |
|
1226 +# Uncomment the following to enable /usr/local search |
|
1227 +# /usr/local/bin |
|
1228 /sbin |
|
1229 ) |
|
1230 MARK_AS_ADVANCED( |
|
1231 @@ -34,7 +35,8 @@ |
|
1232 ${CYGWIN_INSTALL_PATH}/bin |
|
1233 /bin |
|
1234 /usr/bin |
|
1235 - /usr/local/bin |
|
1236 +# Uncomment the following to enable /usr/local search |
|
1237 +# /usr/local/bin |
|
1238 /sbin |
|
1239 ) |
|
1240 MARK_AS_ADVANCED( |
|
1241 @@ -46,7 +48,8 @@ |
|
1242 ${CYGWIN_INSTALL_PATH}/bin |
|
1243 /bin |
|
1244 /usr/bin |
|
1245 - /usr/local/bin |
|
1246 +# Uncomment the following to enable /usr/local search |
|
1247 +# /usr/local/bin |
|
1248 /sbin |
|
1249 ) |
|
1250 MARK_AS_ADVANCED( |
|
1251 @@ -58,7 +61,8 @@ |
|
1252 ${CYGWIN_INSTALL_PATH}/bin |
|
1253 /bin |
|
1254 /usr/bin |
|
1255 - /usr/local/bin |
|
1256 +# Uncomment the following to enable /usr/local search |
|
1257 +# /usr/local/bin |
|
1258 /sbin |
|
1259 ) |
|
1260 MARK_AS_ADVANCED( |
|
1261 @@ -70,7 +74,8 @@ |
|
1262 ${CYGWIN_INSTALL_PATH}/bin |
|
1263 /bin |
|
1264 /usr/bin |
|
1265 - /usr/local/bin |
|
1266 +# Uncomment the following to enable /usr/local search |
|
1267 +# /usr/local/bin |
|
1268 /sbin |
|
1269 ) |
|
1270 MARK_AS_ADVANCED( |
|
1271 @@ -85,7 +90,8 @@ |
|
1272 ${CYGWIN_INSTALL_PATH}/bin |
|
1273 /bin |
|
1274 /usr/bin |
|
1275 - /usr/local/bin |
|
1276 +# Uncomment the following to enable /usr/local search |
|
1277 +# /usr/local/bin |
|
1278 /sbin |
|
1279 ) |
|
1280 MARK_AS_ADVANCED( |
|
1281 diff -ru cmake-2.8.6.org//Modules/Findosg_functions.cmake cmake-2.8.6/Modules/Findosg_functions.cmake |
|
1282 --- cmake-2.8.6.org//Modules/Findosg_functions.cmake Tue Oct 4 09:09:24 2011 |
|
1283 +++ cmake-2.8.6/Modules/Findosg_functions.cmake Mon Oct 10 17:06:52 2011 |
|
1284 @@ -34,7 +34,8 @@ |
|
1285 PATHS |
|
1286 /sw # Fink |
|
1287 /opt/local # DarwinPorts |
|
1288 - /opt/csw # Blastwave |
|
1289 +# Uncomment the following to enable /opt/csw search |
|
1290 +# /opt/csw # Blastwave |
|
1291 /opt |
|
1292 /usr/freeware |
|
1293 ) |
|
1294 @@ -58,7 +59,8 @@ |
|
1295 PATHS |
|
1296 /sw # Fink |
|
1297 /opt/local # DarwinPorts |
|
1298 - /opt/csw # Blastwave |
|
1299 +# Uncomment the following to enable /opt/csw search |
|
1300 +# /opt/csw # Blastwave |
|
1301 /opt |
|
1302 /usr/freeware |
|
1303 ) |
|
1304 @@ -74,7 +76,8 @@ |
|
1305 PATHS |
|
1306 /sw # Fink |
|
1307 /opt/local # DarwinPorts |
|
1308 - /opt/csw # Blastwave |
|
1309 +# Uncomment the following to enable /opt/csw search |
|
1310 +# /opt/csw # Blastwave |
|
1311 /opt |
|
1312 /usr/freeware |
|
1313 ) |
|
1314 diff -ru cmake-2.8.6.org//Modules/GetPrerequisites.cmake cmake-2.8.6/Modules/GetPrerequisites.cmake |
|
1315 --- cmake-2.8.6.org//Modules/GetPrerequisites.cmake Tue Oct 4 09:09:24 2011 |
|
1316 +++ cmake-2.8.6/Modules/GetPrerequisites.cmake Tue Oct 11 10:18:31 2011 |
|
1317 @@ -588,7 +588,8 @@ |
|
1318 "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN" |
|
1319 "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" |
|
1320 "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" |
|
1321 - "/usr/local/bin" |
|
1322 +# Uncomment the following to enable /usr/local search |
|
1323 +# "/usr/local/bin" |
|
1324 "/usr/bin" |
|
1325 ) |
|
1326 |
|
1327 diff -ru cmake-2.8.6.org//Modules/UseJava.cmake cmake-2.8.6/Modules/UseJava.cmake |
|
1328 --- cmake-2.8.6.org//Modules/UseJava.cmake Tue Oct 4 09:09:24 2011 |
|
1329 +++ cmake-2.8.6/Modules/UseJava.cmake Tue Oct 11 10:22:41 2011 |
|
1330 @@ -445,7 +445,8 @@ |
|
1331 set(_jar_versions) |
|
1332 set(_jar_paths |
|
1333 /usr/share/java/ |
|
1334 - /usr/local/share/java/ |
|
1335 +# Uncomment the following to enable /usr/local search |
|
1336 +# /usr/local/share/java/ |
|
1337 ${Java_JAR_PATHS}) |
|
1338 set(_jar_doc "NOTSET") |
|
1339 |
|
1340 diff -ru cmake-2.8.6.org//Source/cmDocumentation.cxx cmake-2.8.6/Source/cmDocumentation.cxx |
|
1341 --- cmake-2.8.6.org//Source/cmDocumentation.cxx Tue Oct 4 09:09:24 2011 |
|
1342 +++ cmake-2.8.6/Source/cmDocumentation.cxx Tue Oct 18 12:33:05 2011 |
|
1343 @@ -1288,6 +1288,7 @@ |
|
1344 bool cmDocumentation::PrintDocumentationUsage(std::ostream& os) |
|
1345 { |
|
1346 this->ClearSections(); |
|
1347 + this->AddSectionToPrint("Name"); |
|
1348 this->AddSectionToPrint("Usage"); |
|
1349 this->AddSectionToPrint("Options"); |
|
1350 if(this->ShowGenerators) |
|
1351 @@ -1314,6 +1315,7 @@ |
|
1352 this->ClearSections(); |
|
1353 this->CreateModulesSection(); |
|
1354 this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Modules)); |
|
1355 + this->AddSectionToPrint("Name"); |
|
1356 this->AddSectionToPrint("Description"); |
|
1357 this->AddSectionToPrint("Modules"); |
|
1358 this->AddSectionToPrint("Copyright"); |
|
1359 @@ -1330,6 +1332,7 @@ |
|
1360 this->ClearSections(); |
|
1361 this->CreateCustomModulesSection(); |
|
1362 this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CustomModules)); |
|
1363 + this->AddSectionToPrint("Name"); |
|
1364 this->AddSectionToPrint("Description"); |
|
1365 this->AddSectionToPrint("Custom CMake Modules"); |
|
1366 // the custom modules are most probably not under Kitware's copyright, Alex |
|
1367 @@ -1347,6 +1350,7 @@ |
|
1368 { |
|
1369 this->ClearSections(); |
|
1370 this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Policies)); |
|
1371 + this->AddSectionToPrint("Name"); |
|
1372 this->AddSectionToPrint("Description"); |
|
1373 this->AddSectionToPrint("Policies"); |
|
1374 this->AddSectionToPrint("Copyright"); |
|
1375 @@ -1363,6 +1367,7 @@ |
|
1376 { |
|
1377 this->ClearSections(); |
|
1378 this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Properties)); |
|
1379 + this->AddSectionToPrint("Name"); |
|
1380 this->AddSectionToPrint("Properties Description"); |
|
1381 for (std::vector<std::string>::iterator i = |
|
1382 this->PropertySections.begin(); |
|
1383 @@ -1383,6 +1388,7 @@ |
|
1384 { |
|
1385 this->ClearSections(); |
|
1386 this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Variables)); |
|
1387 + this->AddSectionToPrint("Name"); |
|
1388 for (std::vector<std::string>::iterator i = |
|
1389 this->VariableSections.begin(); |
|
1390 i != this->VariableSections.end(); ++i) |
|
1391 @@ -1402,6 +1408,7 @@ |
|
1392 { |
|
1393 this->ClearSections(); |
|
1394 this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Commands)); |
|
1395 + this->AddSectionToPrint("Name"); |
|
1396 this->AddSectionToPrint("Commands"); |
|
1397 this->AddSectionToPrint("Copyright"); |
|
1398 this->AddSectionToPrint("Standard See Also"); |
|
1399 @@ -1416,6 +1423,7 @@ |
|
1400 { |
|
1401 this->ClearSections(); |
|
1402 this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CompatCommands)); |
|
1403 + this->AddSectionToPrint("Name"); |
|
1404 this->AddSectionToPrint("Compatibility Commands Description"); |
|
1405 this->AddSectionToPrint("Compatibility Commands"); |
|
1406 this->AddSectionToPrint("Copyright"); |