20 - /usr/local/jdk-1.7.0/bin |
19 - /usr/local/jdk-1.7.0/bin |
21 - /usr/local/jdk-1.6.0/bin |
20 - /usr/local/jdk-1.6.0/bin |
22 ) |
21 ) |
23 # if no compiler has been specified yet, then look for one |
22 # if no compiler has been specified yet, then look for one |
24 if(CMAKE_Java_COMPILER_INIT) |
23 if(CMAKE_Java_COMPILER_INIT) |
25 diff -rup cmake-3.3.2-orig/Modules/CMakeDetermineSystem.cmake cmake-3.3.2/Modules/CMakeDetermineSystem.cmake |
24 --- cmake-3.7.2/Modules/CMakeDetermineSystem.cmake.orig 2017-03-05 08:45:05.171050205 +0000 |
26 --- cmake-3.3.2-orig/Modules/CMakeDetermineSystem.cmake 2015-09-16 09:53:05.000000000 -0700 |
25 +++ cmake-3.7.2/Modules/CMakeDetermineSystem.cmake 2017-03-05 08:45:23.230750646 +0000 |
27 +++ cmake-3.3.2/Modules/CMakeDetermineSystem.cmake 2015-10-15 16:00:14.018836993 -0700 |
26 @@ -33,7 +33,7 @@ |
28 @@ -43,7 +43,7 @@ |
|
29 |
27 |
30 # find out on which system cmake runs |
28 # find out on which system cmake runs |
31 if(CMAKE_HOST_UNIX) |
29 if(CMAKE_HOST_UNIX) |
32 - find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) |
30 - find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) |
33 + find_program(CMAKE_UNAME uname /bin /usr/bin ) |
31 + find_program(CMAKE_UNAME uname /bin /usr/bin ) |
34 if(CMAKE_UNAME) |
32 if(CMAKE_UNAME) |
35 exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) |
33 exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) |
36 exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) |
34 exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) |
37 diff -rup cmake-3.3.2-orig/Modules/FindFLTK.cmake cmake-3.3.2/Modules/FindFLTK.cmake |
35 --- cmake-3.7.2/Modules/FindFLTK.cmake.orig 2017-03-05 08:46:07.893932358 +0000 |
38 --- cmake-3.3.2-orig/Modules/FindFLTK.cmake 2015-09-16 09:53:05.000000000 -0700 |
36 +++ cmake-3.7.2/Modules/FindFLTK.cmake 2017-03-05 08:46:42.186477498 +0000 |
39 +++ cmake-3.3.2/Modules/FindFLTK.cmake 2015-10-15 16:02:29.304438640 -0700 |
37 @@ -116,9 +116,7 @@ |
40 @@ -126,9 +126,7 @@ if(NOT FLTK_DIR) |
|
41 |
38 |
42 PATHS |
39 PATHS |
43 # Look in standard UNIX install locations. |
40 # Look in standard UNIX install locations. |
44 - /usr/local/lib/fltk |
41 - /usr/local/lib/fltk |
45 /usr/lib/fltk |
42 /usr/lib/fltk |
46 - /usr/local/fltk |
43 - /usr/local/fltk |
47 /usr/X11R6/include |
44 /usr/X11R6/include |
48 |
45 |
49 # Help the user find it if we cannot. |
46 # Help the user find it if we cannot. |
50 @@ -227,7 +225,6 @@ endif() |
47 @@ -217,7 +215,6 @@ |
51 endif() |
48 endif() |
52 |
49 |
53 set(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} |
50 set(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} |
54 - /usr/local/fltk |
51 - /usr/local/fltk |
55 /usr/X11R6/include |
52 /usr/X11R6/include |
56 ${_FLTK_POSSIBLE_INCLUDE_DIRS} |
53 ${_FLTK_POSSIBLE_INCLUDE_DIRS} |
57 ) |
54 ) |
58 @@ -248,7 +245,6 @@ endif() |
55 @@ -238,7 +235,6 @@ |
59 endif() |
56 endif() |
60 |
57 |
61 set(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} |
58 set(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} |
62 - /usr/local/fltk/lib |
59 - /usr/local/fltk/lib |
63 /usr/X11R6/lib |
60 /usr/X11R6/lib |
64 ${FLTK_INCLUDE_DIR}/lib |
61 ${FLTK_INCLUDE_DIR}/lib |
65 ${_FLTK_POSSIBLE_LIBRARY_DIR} |
62 ${_FLTK_POSSIBLE_LIBRARY_DIR} |
66 diff -rup cmake-3.3.2-orig/Modules/FindFLTK2.cmake cmake-3.3.2/Modules/FindFLTK2.cmake |
63 --- cmake-3.7.2/Modules/FindFLTK2.cmake.orig 2017-03-05 08:48:08.355288417 +0000 |
67 --- cmake-3.3.2-orig/Modules/FindFLTK2.cmake 2015-09-16 09:53:05.000000000 -0700 |
64 +++ cmake-3.7.2/Modules/FindFLTK2.cmake 2017-03-05 08:48:36.774525049 +0000 |
68 +++ cmake-3.3.2/Modules/FindFLTK2.cmake 2015-10-15 16:02:37.479633550 -0700 |
65 @@ -81,9 +81,7 @@ |
69 @@ -91,9 +91,7 @@ if(NOT FLTK2_DIR) |
|
70 ${FLTK2_DIR_SEARCH} |
66 ${FLTK2_DIR_SEARCH} |
71 |
67 |
72 # Look in standard UNIX install locations. |
68 # Look in standard UNIX install locations. |
73 - /usr/local/lib/fltk2 |
69 - /usr/local/lib/fltk2 |
74 /usr/lib/fltk2 |
70 /usr/lib/fltk2 |
75 - /usr/local/fltk2 |
71 - /usr/local/fltk2 |
76 /usr/X11R6/include |
72 /usr/X11R6/include |
77 |
73 |
78 # Help the user find it if we cannot. |
74 # Help the user find it if we cannot. |
79 @@ -186,14 +184,12 @@ if(FLTK2_DIR) |
75 @@ -176,14 +174,12 @@ |
80 endif() |
76 endif() |
81 |
77 |
82 set(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH} |
78 set(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH} |
83 - /usr/local/fltk2 |
79 - /usr/local/fltk2 |
84 /usr/X11R6/include |
80 /usr/X11R6/include |
89 set(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH} |
85 set(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH} |
90 - /usr/local/fltk2/lib |
86 - /usr/local/fltk2/lib |
91 /usr/X11R6/lib |
87 /usr/X11R6/lib |
92 ${FLTK2_INCLUDE_DIR}/lib |
88 ${FLTK2_INCLUDE_DIR}/lib |
93 ) |
89 ) |
94 diff -rup cmake-3.3.2-orig/Modules/FindFreetype.cmake cmake-3.3.2/Modules/FindFreetype.cmake |
90 --- cmake-3.7.2/Modules/FindFreetype.cmake.orig 2017-03-05 08:49:26.345638651 +0000 |
95 --- cmake-3.3.2-orig/Modules/FindFreetype.cmake 2015-09-16 09:53:05.000000000 -0700 |
91 +++ cmake-3.7.2/Modules/FindFreetype.cmake 2017-03-05 08:50:02.611487674 +0000 |
96 +++ cmake-3.3.2/Modules/FindFreetype.cmake 2015-10-15 16:02:49.690141344 -0700 |
92 @@ -47,8 +47,6 @@ |
97 @@ -58,8 +58,6 @@ find_path( |
|
98 ENV FREETYPE_DIR |
93 ENV FREETYPE_DIR |
99 PATHS |
94 PATHS |
100 /usr/X11R6 |
95 /usr/X11R6 |
101 - /usr/local/X11R6 |
96 - /usr/local/X11R6 |
102 - /usr/local/X11 |
97 - /usr/local/X11 |
103 /usr/freeware |
98 /usr/freeware |
104 ENV GTKMM_BASEPATH |
99 ENV GTKMM_BASEPATH |
105 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] |
100 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] |
106 @@ -79,8 +77,6 @@ find_path( |
101 --- cmake-3.7.2/Modules/FindGTK.cmake.orig 2017-03-05 08:50:39.170157149 +0000 |
107 ENV FREETYPE_DIR |
102 +++ cmake-3.7.2/Modules/FindGTK.cmake 2017-03-05 08:50:55.309818572 +0000 |
108 PATHS |
103 @@ -33,9 +33,7 @@ |
109 /usr/X11R6 |
|
110 - /usr/local/X11R6 |
|
111 - /usr/local/X11 |
|
112 /usr/freeware |
|
113 ENV GTKMM_BASEPATH |
|
114 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] |
|
115 @@ -100,8 +96,6 @@ find_library(FREETYPE_LIBRARY |
|
116 ENV FREETYPE_DIR |
|
117 PATHS |
|
118 /usr/X11R6 |
|
119 - /usr/local/X11R6 |
|
120 - /usr/local/X11 |
|
121 /usr/freeware |
|
122 ENV GTKMM_BASEPATH |
|
123 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] |
|
124 diff -rup cmake-3.3.2-orig/Modules/FindGTK.cmake cmake-3.3.2/Modules/FindGTK.cmake |
|
125 --- cmake-3.3.2-orig/Modules/FindGTK.cmake 2015-09-16 09:53:05.000000000 -0700 |
|
126 +++ cmake-3.3.2/Modules/FindGTK.cmake 2015-10-15 16:02:57.198045066 -0700 |
|
127 @@ -43,9 +43,7 @@ if(UNIX) |
|
128 find_path( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h |
104 find_path( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h |
129 PATHS |
105 PATHS |
130 /usr/openwin/share/include |
106 /usr/openwin/share/include |
131 - /usr/local/include/glib12 |
107 - /usr/local/include/glib12 |
132 /usr/lib/glib/include |
108 /usr/lib/glib/include |
133 - /usr/local/lib/glib/include |
109 - /usr/local/lib/glib/include |
134 /opt/gnome/include |
110 /opt/gnome/include |
135 /opt/gnome/lib/glib/include |
111 /opt/gnome/lib/glib/include |
136 ) |
112 ) |
137 diff -rup cmake-3.3.2-orig/Modules/FindGTK2.cmake cmake-3.3.2/Modules/FindGTK2.cmake |
113 --- cmake-3.7.2/Modules/FindGTK2.cmake.orig 2017-03-05 08:51:30.348262378 +0000 |
138 --- cmake-3.3.2-orig/Modules/FindGTK2.cmake 2015-09-16 09:53:05.000000000 -0700 |
114 +++ cmake-3.7.2/Modules/FindGTK2.cmake 2017-03-05 08:51:54.704983583 +0000 |
139 +++ cmake-3.3.2/Modules/FindGTK2.cmake 2015-10-15 16:03:16.961920249 -0700 |
115 @@ -290,8 +290,6 @@ |
140 @@ -263,8 +263,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd |
|
141 find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr} |
116 find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr} |
142 PATHS |
117 PATHS |
143 ${_gtk2_arch_dir} |
118 ${_gtk2_arch_dir} |
144 - /usr/local/lib64 |
119 - /usr/local/lib64 |
145 - /usr/local/lib |
120 - /usr/local/lib |
146 /usr/lib64 |
121 /usr/lib64 |
147 /usr/lib |
122 /usr/lib |
148 /usr/X11R6/include |
123 /usr/X11R6/include |
149 diff -rup cmake-3.3.2-orig/Modules/FindIce.cmake cmake-3.3.2/Modules/FindIce.cmake |
124 --- cmake-3.7.2/Modules/FindIce.cmake.orig 2017-03-05 08:52:32.735383957 +0000 |
150 --- cmake-3.3.2-orig/Modules/FindIce.cmake 2015-09-16 09:53:05.000000000 -0700 |
125 +++ cmake-3.7.2/Modules/FindIce.cmake 2017-03-05 08:52:50.858112968 +0000 |
151 +++ cmake-3.3.2/Modules/FindIce.cmake 2015-10-15 16:03:33.354245173 -0700 |
126 @@ -332,7 +332,7 @@ |
152 @@ -255,7 +255,7 @@ function(_Ice_FIND) |
|
153 # In common use on Linux, MacOS X (homebrew) and FreeBSD; prefer |
127 # In common use on Linux, MacOS X (homebrew) and FreeBSD; prefer |
154 # version-specific dir |
128 # version-specific dir |
155 list(APPEND ice_slice_paths |
129 list(APPEND ice_slice_paths |
156 - /usr/local/share /usr/share) |
130 - /usr/local/share /usr/share) |
157 + /usr/share) |
131 + /usr/share) |
158 list(APPEND ice_slice_suffixes |
132 list(APPEND ice_slice_suffixes |
159 "Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice" |
133 "Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice" |
160 "Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice" |
134 "Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice" |
161 diff -rup cmake-3.3.2-orig/Modules/FindJava.cmake cmake-3.3.2/Modules/FindJava.cmake |
135 --- cmake-3.7.2/Modules/FindJava.cmake.orig 2017-03-05 08:53:18.737429316 +0000 |
162 --- cmake-3.3.2-orig/Modules/FindJava.cmake 2015-09-16 09:53:05.000000000 -0700 |
136 +++ cmake-3.7.2/Modules/FindJava.cmake 2017-03-05 08:53:50.174092862 +0000 |
163 +++ cmake-3.3.2/Modules/FindJava.cmake 2015-10-15 16:03:41.350517068 -0700 |
137 @@ -92,15 +92,11 @@ |
164 @@ -91,15 +91,11 @@ list(APPEND _JAVA_HINTS |
|
165 set(_JAVA_PATHS |
138 set(_JAVA_PATHS |
166 /usr/lib/java/bin |
139 /usr/lib/java/bin |
167 /usr/share/java/bin |
140 /usr/share/java/bin |
168 - /usr/local/java/bin |
141 - /usr/local/java/bin |
169 - /usr/local/java/share/bin |
142 - /usr/local/java/share/bin |
190 - /usr/local/lib/java/jre/lib/{libarch} |
163 - /usr/local/lib/java/jre/lib/{libarch} |
191 - /usr/local/share/java/jre/lib/{libarch} |
164 - /usr/local/share/java/jre/lib/{libarch} |
192 /usr/lib/j2sdk1.4-sun/jre/lib/{libarch} |
165 /usr/lib/j2sdk1.4-sun/jre/lib/{libarch} |
193 /usr/lib/j2sdk1.5-sun/jre/lib/{libarch} |
166 /usr/lib/j2sdk1.5-sun/jre/lib/{libarch} |
194 /opt/sun-jdk-1.5.0.04/jre/lib/{libarch} |
167 /opt/sun-jdk-1.5.0.04/jre/lib/{libarch} |
195 @@ -151,11 +148,6 @@ |
168 @@ -149,11 +146,6 @@ |
196 /usr/lib/jvm/default-java/jre/lib/{libarch} |
169 /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 |
197 /usr/lib/jvm/default-java/jre/lib |
170 /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 |
198 /usr/lib/jvm/default-java/lib |
171 /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 |
199 - # OpenBSD specific paths for default JVM |
172 - # OpenBSD specific paths for default JVM |
200 - /usr/local/jdk-1.7.0/jre/lib/{libarch} |
173 - /usr/local/jdk-1.7.0/jre/lib/{libarch} |
201 - /usr/local/jre-1.7.0/lib/{libarch} |
174 - /usr/local/jre-1.7.0/lib/{libarch} |
202 - /usr/local/jdk-1.6.0/jre/lib/{libarch} |
175 - /usr/local/jdk-1.6.0/jre/lib/{libarch} |
203 - /usr/local/jre-1.6.0/lib/{libarch} |
176 - /usr/local/jre-1.6.0/lib/{libarch} |
204 # SuSE specific paths for default JVM |
177 # SuSE specific paths for default JVM |
205 /usr/lib64/jvm/java/jre/lib/{libarch} |
178 /usr/lib64/jvm/java/jre/lib/{libarch} |
206 /usr/lib64/jvm/jre/lib/{libarch} |
179 /usr/lib64/jvm/jre/lib/{libarch} |
207 @@ -182,23 +174,17 @@ |
180 @@ -183,9 +175,7 @@ |
208 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" |
181 |
209 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" |
182 JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES |
210 /usr/include |
183 /usr/include |
211 - /usr/local/include |
184 - /usr/local/include |
212 /usr/lib/java/include |
185 /usr/lib/java/include |
213 - /usr/local/lib/java/include |
186 - /usr/local/lib/java/include |
214 /usr/lib/jvm/java/include |
187 /usr/lib/jvm/java/include |
215 /usr/lib/jvm/java-6-sun/include |
188 /usr/lib/jvm/java-6-sun/include |
216 /usr/lib/jvm/java-1.5.0-sun/include |
189 /usr/lib/jvm/java-1.5.0-sun/include |
217 /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex |
190 @@ -194,15 +184,11 @@ |
218 /usr/lib/jvm/java-6-openjdk/include |
191 /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10 |
|
192 /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10 |
|
193 /usr/lib/jvm/java-6-openjdk-{libarch}/include # ubuntu 15.10 |
219 - /usr/local/share/java/include |
194 - /usr/local/share/java/include |
220 /usr/lib/j2sdk1.4-sun/include |
195 /usr/lib/j2sdk1.4-sun/include |
221 /usr/lib/j2sdk1.5-sun/include |
196 /usr/lib/j2sdk1.5-sun/include |
222 /opt/sun-jdk-1.5.0.04/include |
197 /opt/sun-jdk-1.5.0.04/include |
223 # Debian specific path for default JVM |
198 # Debian specific path for default JVM |
226 - /usr/local/jdk-1.7.0/include |
201 - /usr/local/jdk-1.7.0/include |
227 - /usr/local/jdk-1.6.0/include |
202 - /usr/local/jdk-1.6.0/include |
228 # SuSE specific paths for default JVM |
203 # SuSE specific paths for default JVM |
229 /usr/lib64/jvm/java/include |
204 /usr/lib64/jvm/java/include |
230 ) |
205 ) |
231 diff -rup cmake-3.3.2-orig/Modules/FindKDE3.cmake cmake-3.3.2/Modules/FindKDE3.cmake |
206 --- cmake-3.7.2/Modules/FindKDE3.cmake.orig 2017-03-05 08:56:02.904986494 +0000 |
232 --- cmake-3.3.2-orig/Modules/FindKDE3.cmake 2015-09-16 09:53:05.000000000 -0700 |
207 +++ cmake-3.7.2/Modules/FindKDE3.cmake 2017-03-05 08:56:12.595455090 +0000 |
233 +++ cmake-3.3.2/Modules/FindKDE3.cmake 2015-10-15 16:04:17.505499047 -0700 |
208 @@ -201,7 +201,6 @@ |
234 @@ -212,7 +212,6 @@ find_path(KDE3_INCLUDE_DIR kpassdlg.h |
|
235 /opt/kde3/include |
209 /opt/kde3/include |
236 /opt/kde/include |
210 /opt/kde/include |
237 /usr/include/kde |
211 /usr/include/kde |
238 - /usr/local/include/kde |
212 - /usr/local/include/kde |
239 ) |
213 ) |
240 |
214 |
241 #now the KDE library directory |
215 #now the KDE library directory |
242 diff -rup cmake-3.3.2-orig/Modules/FindPHP4.cmake cmake-3.3.2/Modules/FindPHP4.cmake |
216 --- cmake-3.7.2/Modules/FindPHP4.cmake.orig 2017-03-05 08:56:46.114693789 +0000 |
243 --- cmake-3.3.2-orig/Modules/FindPHP4.cmake 2015-09-16 09:53:05.000000000 -0700 |
217 +++ cmake-3.7.2/Modules/FindPHP4.cmake 2017-03-05 08:56:59.870641022 +0000 |
244 +++ cmake-3.3.2/Modules/FindPHP4.cmake 2015-10-15 16:04:40.389614402 -0700 |
218 @@ -18,10 +18,7 @@ |
245 @@ -28,10 +28,7 @@ |
|
246 |
219 |
247 set(PHP4_POSSIBLE_INCLUDE_PATHS |
220 set(PHP4_POSSIBLE_INCLUDE_PATHS |
248 /usr/include/php4 |
221 /usr/include/php4 |
249 - /usr/local/include/php4 |
222 - /usr/local/include/php4 |
250 /usr/include/php |
223 /usr/include/php |
251 - /usr/local/include/php |
224 - /usr/local/include/php |
252 - /usr/local/apache/php |
225 - /usr/local/apache/php |
253 ) |
226 ) |
254 |
227 |
255 set(PHP4_POSSIBLE_LIB_PATHS |
228 set(PHP4_POSSIBLE_LIB_PATHS |
256 diff -rup cmake-3.3.2-orig/Modules/FindPike.cmake cmake-3.3.2/Modules/FindPike.cmake |
229 --- cmake-3.7.2/Modules/FindPike.cmake.orig 2017-03-05 08:57:33.909167110 +0000 |
257 --- cmake-3.3.2-orig/Modules/FindPike.cmake 2015-09-16 09:53:05.000000000 -0700 |
230 +++ cmake-3.7.2/Modules/FindPike.cmake 2017-03-05 08:58:11.033874482 +0000 |
258 +++ cmake-3.3.2/Modules/FindPike.cmake 2015-10-15 16:04:53.774097220 -0700 |
231 @@ -18,7 +18,7 @@ |
259 @@ -28,7 +28,7 @@ |
|
260 |
232 |
261 file(GLOB PIKE_POSSIBLE_INCLUDE_PATHS |
233 file(GLOB PIKE_POSSIBLE_INCLUDE_PATHS |
262 /usr/include/pike/* |
234 /usr/include/pike/* |
263 - /usr/local/include/pike/*) |
235 - /usr/local/include/pike/*) |
264 + ) |
236 + ) |
265 |
237 |
266 find_path(PIKE_INCLUDE_PATH program.h |
238 find_path(PIKE_INCLUDE_PATH program.h |
267 ${PIKE_POSSIBLE_INCLUDE_PATHS}) |
239 ${PIKE_POSSIBLE_INCLUDE_PATHS}) |
268 diff -rup cmake-3.3.2-orig/Modules/FindQt.cmake cmake-3.3.2/Modules/FindQt.cmake |
240 --- cmake-3.7.2/Modules/FindQt.cmake.orig 2017-03-05 08:58:40.456331975 +0000 |
269 --- cmake-3.3.2-orig/Modules/FindQt.cmake 2015-09-16 09:53:05.000000000 -0700 |
241 +++ cmake-3.7.2/Modules/FindQt.cmake 2017-03-05 08:59:49.590504891 +0000 |
270 +++ cmake-3.3.2/Modules/FindQt.cmake 2015-10-15 16:05:36.889550409 -0700 |
242 @@ -105,12 +105,9 @@ |
271 @@ -115,12 +115,9 @@ find_file( QT4_QGLOBAL_H_FILE qglobal.h |
|
272 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" |
243 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" |
273 ${qt_headers}/Qt |
244 ${qt_headers}/Qt |
274 $ENV{QTDIR}/include/Qt |
245 $ENV{QTDIR}/include/Qt |
275 - /usr/local/qt/include/Qt |
246 - /usr/local/qt/include/Qt |
276 - /usr/local/include/Qt |
247 - /usr/local/include/Qt |
292 /usr/share/qt3/include |
263 /usr/share/qt3/include |
293 - /usr/local/include/X11/qt3 |
264 - /usr/local/include/X11/qt3 |
294 C:/Progra~1/qt/include |
265 C:/Progra~1/qt/include |
295 /usr/include/qt3 ) |
266 /usr/include/qt3 ) |
296 |
267 |
297 diff -rup cmake-3.3.2-orig/Modules/FindQt3.cmake cmake-3.3.2/Modules/FindQt3.cmake |
268 --- cmake-3.7.2/Modules/FindQt3.cmake.orig 2017-03-05 09:00:20.575469532 +0000 |
298 --- cmake-3.3.2-orig/Modules/FindQt3.cmake 2015-09-16 09:53:05.000000000 -0700 |
269 +++ cmake-3.7.2/Modules/FindQt3.cmake 2017-03-05 09:00:58.249656537 +0000 |
299 +++ cmake-3.3.2/Modules/FindQt3.cmake 2015-10-15 16:05:55.753228663 -0700 |
270 @@ -61,14 +61,12 @@ |
300 @@ -71,14 +71,12 @@ find_path(QT_INCLUDE_DIR qt.h |
|
301 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
271 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
302 $ENV{QTDIR}/include |
272 $ENV{QTDIR}/include |
303 ${GLOB_PATHS} |
273 ${GLOB_PATHS} |
304 - /usr/local/qt/include |
274 - /usr/local/qt/include |
305 /usr/lib/qt/include |
275 /usr/lib/qt/include |
310 /usr/include/qt3 |
280 /usr/include/qt3 |
311 - /usr/local/include/X11/qt3 |
281 - /usr/local/include/X11/qt3 |
312 ) |
282 ) |
313 |
283 |
314 # if qglobal.h is not in the qt_include_dir then set |
284 # if qglobal.h is not in the qt_include_dir then set |
315 @@ -111,7 +109,6 @@ if (QT_MT_REQUIRED) |
285 @@ -101,7 +99,6 @@ |
316 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" |
286 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" |
317 ENV QTDIR |
287 ENV QTDIR |
318 ${GLOB_PATHS_LIB} |
288 ${GLOB_PATHS_LIB} |
319 - /usr/local/qt |
289 - /usr/local/qt |
320 /usr/lib/qt |
290 /usr/lib/qt |
321 /usr/lib/qt3 |
291 /usr/lib/qt3 |
322 /usr/share/qt3 |
292 /usr/share/qt3 |
323 @@ -132,7 +129,6 @@ else () |
293 @@ -122,7 +119,6 @@ |
324 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" |
294 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" |
325 ENV QTDIR |
295 ENV QTDIR |
326 ${GLOB_PATHS_LIB} |
296 ${GLOB_PATHS_LIB} |
327 - /usr/local/qt |
297 - /usr/local/qt |
328 /usr/lib/qt |
298 /usr/lib/qt |
329 /usr/lib/qt3 |
299 /usr/lib/qt3 |
330 /usr/share/qt3 |
300 /usr/share/qt3 |
331 @@ -151,7 +147,6 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY |
301 @@ -141,7 +137,6 @@ |
332 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" |
302 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" |
333 ENV QTDIR |
303 ENV QTDIR |
334 ${GLOB_PATHS_LIB} |
304 ${GLOB_PATHS_LIB} |
335 - /usr/local/qt |
305 - /usr/local/qt |
336 /usr/lib/qt3 |
306 /usr/lib/qt3 |
337 /usr/share/qt3 |
307 /usr/share/qt3 |
338 C:/Progra~1/qt |
308 C:/Progra~1/qt |
339 @@ -169,8 +164,6 @@ find_program(QT_MOC_EXECUTABLE |
309 @@ -159,8 +154,6 @@ |
340 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" |
310 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" |
341 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
311 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
342 ${GLOB_PATHS_BIN} |
312 ${GLOB_PATHS_BIN} |
343 - /usr/local/lib/qt3 |
313 - /usr/local/lib/qt3 |
344 - /usr/local/qt |
314 - /usr/local/qt |
345 /usr/lib/qt |
315 /usr/lib/qt |
346 /usr/lib/qt3 |
316 /usr/lib/qt3 |
347 /usr/share/qt3 |
317 /usr/share/qt3 |
348 @@ -194,7 +187,6 @@ find_program(QT_UIC_EXECUTABLE |
318 @@ -184,7 +177,6 @@ |
349 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" |
319 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" |
350 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
320 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" |
351 ${GLOB_PATHS_BIN} |
321 ${GLOB_PATHS_BIN} |
352 - /usr/local/qt |
322 - /usr/local/qt |
353 /usr/lib/qt |
323 /usr/lib/qt |
354 /usr/lib/qt3 |
324 /usr/lib/qt3 |
355 /usr/share/qt3 |
325 /usr/share/qt3 |
356 diff -rup cmake-3.3.2-orig/Modules/FindSelfPackers.cmake cmake-3.3.2/Modules/FindSelfPackers.cmake |
326 --- cmake-3.7.2/Modules/FindSelfPackers.cmake.orig 2017-03-05 09:01:25.903979689 +0000 |
357 --- cmake-3.3.2-orig/Modules/FindSelfPackers.cmake 2015-09-16 09:53:05.000000000 -0700 |
327 +++ cmake-3.7.2/Modules/FindSelfPackers.cmake 2017-03-05 09:01:45.530575880 +0000 |
358 +++ cmake-3.3.2/Modules/FindSelfPackers.cmake 2015-10-15 16:06:00.860724230 -0700 |
328 @@ -22,7 +22,6 @@ |
359 @@ -32,7 +32,6 @@ find_program(SELF_PACKER_FOR_EXECUTABLE |
329 ${CYGWIN_INSTALL_PATH}/bin |
360 ${CYGWIN_INSTALL_PATH}/bin |
330 /bin |
361 /bin |
331 /usr/bin |
362 /usr/bin |
332 - /usr/local/bin |
363 - /usr/local/bin |
333 /sbin |
364 /sbin |
334 ) |
365 ) |
335 |
366 |
336 @@ -31,7 +30,6 @@ |
367 @@ -41,7 +40,6 @@ find_program(SELF_PACKER_FOR_SHARED_LIB |
337 ${CYGWIN_INSTALL_PATH}/bin |
368 ${CYGWIN_INSTALL_PATH}/bin |
338 /bin |
369 /bin |
339 /usr/bin |
370 /usr/bin |
340 - /usr/local/bin |
371 - /usr/local/bin |
341 /sbin |
372 /sbin |
342 ) |
373 ) |
343 |
374 |
344 --- cmake-3.7.2/Modules/FindTCL.cmake.orig 2017-03-05 09:02:20.237562086 +0000 |
375 diff -rup cmake-3.3.2-orig/Modules/FindTCL.cmake cmake-3.3.2/Modules/FindTCL.cmake |
345 +++ cmake-3.7.2/Modules/FindTCL.cmake 2017-03-05 09:02:42.973331967 +0000 |
376 --- cmake-3.3.2-orig/Modules/FindTCL.cmake 2015-09-16 09:53:05.000000000 -0700 |
346 @@ -82,10 +82,6 @@ |
377 +++ cmake-3.3.2/Modules/FindTCL.cmake 2015-10-15 16:06:14.278986739 -0700 |
|
378 @@ -92,10 +92,6 @@ set(TCLTK_POSSIBLE_LIB_PATHS |
|
379 "${TK_LIBRARY_PATH}" |
347 "${TK_LIBRARY_PATH}" |
380 "${TCL_TCLSH_PATH_PARENT}/lib" |
348 "${TCL_TCLSH_PATH_PARENT}/lib" |
381 "${TK_WISH_PATH_PARENT}/lib" |
349 "${TK_WISH_PATH_PARENT}/lib" |
382 - /usr/local/lib/tcl/tcl8.5 |
350 - /usr/local/lib/tcl/tcl8.5 |
383 - /usr/local/lib/tcl/tk8.5 |
351 - /usr/local/lib/tcl/tk8.5 |
384 - /usr/local/lib/tcl/tcl8.4 |
352 - /usr/local/lib/tcl/tcl8.4 |
385 - /usr/local/lib/tcl/tk8.4 |
353 - /usr/local/lib/tcl/tk8.4 |
386 ) |
354 ) |
387 |
355 |
388 if(WIN32) |
356 if(WIN32) |
389 @@ -182,12 +178,6 @@ set(TCLTK_POSSIBLE_INCLUDE_PATHS |
357 @@ -172,12 +168,6 @@ |
390 /usr/include/tcl8.3 |
358 /usr/include/tcl8.3 |
391 /usr/include/tcl8.2 |
359 /usr/include/tcl8.2 |
392 /usr/include/tcl8.0 |
360 /usr/include/tcl8.0 |
393 - /usr/local/include/tcl8.6 |
361 - /usr/local/include/tcl8.6 |
394 - /usr/local/include/tk8.6 |
362 - /usr/local/include/tk8.6 |
397 - /usr/local/include/tcl8.4 |
365 - /usr/local/include/tcl8.4 |
398 - /usr/local/include/tk8.4 |
366 - /usr/local/include/tk8.4 |
399 ) |
367 ) |
400 |
368 |
401 if(WIN32) |
369 if(WIN32) |
402 diff -rup cmake-3.3.2-orig/Modules/FindUnixCommands.cmake cmake-3.3.2/Modules/FindUnixCommands.cmake |
370 --- cmake-3.7.2/Modules/FindUnixCommands.cmake.orig 2017-03-05 09:03:18.013057562 +0000 |
403 --- cmake-3.3.2-orig/Modules/FindUnixCommands.cmake 2015-09-16 09:53:05.000000000 -0700 |
371 +++ cmake-3.7.2/Modules/FindUnixCommands.cmake 2017-03-05 09:03:37.143745913 +0000 |
404 +++ cmake-3.3.2/Modules/FindUnixCommands.cmake 2015-10-15 16:06:29.850176368 -0700 |
372 @@ -17,7 +17,6 @@ |
405 @@ -27,7 +27,6 @@ find_program(BASH |
373 ${CYGWIN_INSTALL_PATH}/bin |
406 ${CYGWIN_INSTALL_PATH}/bin |
374 /bin |
407 /bin |
375 /usr/bin |
408 /usr/bin |
376 - /usr/local/bin |
409 - /usr/local/bin |
377 /sbin |
410 /sbin |
378 ) |
411 ) |
379 mark_as_advanced( |
412 mark_as_advanced( |
380 @@ -29,7 +28,6 @@ |
413 @@ -39,7 +38,6 @@ find_program(CP |
381 ${CYGWIN_INSTALL_PATH}/bin |
414 ${CYGWIN_INSTALL_PATH}/bin |
382 /bin |
415 /bin |
383 /usr/bin |
416 /usr/bin |
384 - /usr/local/bin |
417 - /usr/local/bin |
385 /sbin |
418 /sbin |
386 ) |
419 ) |
387 mark_as_advanced( |
420 mark_as_advanced( |
388 @@ -41,7 +39,6 @@ |
421 @@ -51,7 +49,6 @@ find_program(GZIP |
389 ${CYGWIN_INSTALL_PATH}/bin |
422 ${CYGWIN_INSTALL_PATH}/bin |
390 /bin |
423 /bin |
391 /usr/bin |
424 /usr/bin |
392 - /usr/local/bin |
425 - /usr/local/bin |
393 /sbin |
426 /sbin |
394 ) |
427 ) |
395 mark_as_advanced( |
428 mark_as_advanced( |
396 @@ -53,7 +50,6 @@ |
429 @@ -63,7 +60,6 @@ find_program(MV |
397 ${CYGWIN_INSTALL_PATH}/bin |
430 ${CYGWIN_INSTALL_PATH}/bin |
398 /bin |
431 /bin |
399 /usr/bin |
432 /usr/bin |
400 - /usr/local/bin |
433 - /usr/local/bin |
401 /sbin |
434 /sbin |
402 ) |
435 ) |
403 mark_as_advanced( |
436 mark_as_advanced( |
404 @@ -65,7 +61,6 @@ |
437 @@ -75,7 +71,6 @@ find_program(RM |
405 ${CYGWIN_INSTALL_PATH}/bin |
438 ${CYGWIN_INSTALL_PATH}/bin |
406 /bin |
439 /bin |
407 /usr/bin |
440 /usr/bin |
408 - /usr/local/bin |
441 - /usr/local/bin |
409 /sbin |
442 /sbin |
410 ) |
443 ) |
411 mark_as_advanced( |
444 mark_as_advanced( |
412 @@ -80,7 +75,6 @@ |
445 @@ -90,7 +85,6 @@ find_program(TAR |
413 ${CYGWIN_INSTALL_PATH}/bin |
446 ${CYGWIN_INSTALL_PATH}/bin |
414 /bin |
447 /bin |
415 /usr/bin |
448 /usr/bin |
416 - /usr/local/bin |
449 - /usr/local/bin |
417 /sbin |
450 /sbin |
418 ) |
451 ) |
419 mark_as_advanced( |
452 mark_as_advanced( |
420 --- cmake-3.7.2/Modules/GetPrerequisites.cmake.orig 2017-03-05 09:04:10.822914399 +0000 |
453 diff -rup cmake-3.3.2-orig/Modules/GetPrerequisites.cmake cmake-3.3.2/Modules/GetPrerequisites.cmake |
421 +++ cmake-3.7.2/Modules/GetPrerequisites.cmake 2017-03-05 09:04:38.379855244 +0000 |
454 --- cmake-3.3.2-orig/Modules/GetPrerequisites.cmake 2015-09-16 09:53:05.000000000 -0700 |
422 @@ -681,7 +681,6 @@ |
455 +++ cmake-3.3.2/Modules/GetPrerequisites.cmake 2015-10-15 16:08:50.658120397 -0700 |
423 "$ENV{VS71COMNTOOLS}/../../VC7/bin" |
456 @@ -652,7 +652,6 @@ function(get_prerequisites target prereq |
|
457 "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN" |
|
458 "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" |
424 "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" |
459 "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" |
425 "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" |
460 - "/usr/local/bin" |
426 - "/usr/local/bin" |
461 "/usr/bin" |
427 "/usr/bin" |
462 ) |
428 ) |
463 |
429 |
464 diff -rup cmake-3.3.2-orig/Modules/UseJava.cmake cmake-3.3.2/Modules/UseJava.cmake |
430 --- cmake-3.7.2/Modules/UseJava.cmake.orig 2017-03-05 09:05:01.065155976 +0000 |
465 --- cmake-3.3.2-orig/Modules/UseJava.cmake 2015-09-16 09:53:05.000000000 -0700 |
431 +++ cmake-3.7.2/Modules/UseJava.cmake 2017-03-05 09:05:11.341600763 +0000 |
466 +++ cmake-3.3.2/Modules/UseJava.cmake 2015-10-15 16:09:05.181293875 -0700 |
432 @@ -826,7 +826,6 @@ |
467 @@ -659,7 +659,6 @@ function (find_jar VARIABLE) |
|
468 set(_jar_versions) |
433 set(_jar_versions) |
469 set(_jar_paths |
434 set(_jar_paths |
470 /usr/share/java/ |
435 /usr/share/java/ |
471 - /usr/local/share/java/ |
436 - /usr/local/share/java/ |
472 ${Java_JAR_PATHS}) |
437 ${Java_JAR_PATHS}) |