1 |
commit: 92a917e50fcf53fa66ddad9e373e13afb45dd350 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 1 14:56:58 2013 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 1 14:56:58 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=92a917e5 |
7 |
|
8 |
[dev-util/cmake] Version bump wrt bug #483150. |
9 |
|
10 |
Package-Manager: portage-2.2.1 |
11 |
|
12 |
--- |
13 |
dev-util/cmake/cmake-2.8.11.2.ebuild | 199 +++++++++++++++++++++ |
14 |
dev-util/cmake/files/50cmake-gentoo.el | 4 + |
15 |
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ++++ |
16 |
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++ |
17 |
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++ |
18 |
.../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 ++ |
19 |
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++ |
20 |
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++ |
21 |
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++ |
22 |
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++ |
23 |
.../files/cmake-2.8.10-more-no_host_paths.patch | 134 ++++++++++++++ |
24 |
dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 +++++++++ |
25 |
.../files/cmake-2.8.10.2-FindImageMagick.patch | 34 ++++ |
26 |
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++ |
27 |
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++ |
28 |
.../files/cmake-2.8.10.2-implicit-include.patch | 139 ++++++++++++++ |
29 |
dev-util/cmake/files/cmake-2.8.10.2-qt5.patch | 16 ++ |
30 |
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++ |
31 |
.../files/cmake-2.8.11-FindBoost-python.patch | 73 ++++++++ |
32 |
.../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ++++ |
33 |
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 ++++++++++++++ |
34 |
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 +++++ |
35 |
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 ++++++++ |
36 |
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++ |
37 |
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++ |
38 |
dev-util/cmake/files/cmake.vim | 3 + |
39 |
dev-util/cmake/metadata.xml | 5 + |
40 |
27 files changed, 1356 insertions(+) |
41 |
|
42 |
diff --git a/dev-util/cmake/cmake-2.8.11.2.ebuild b/dev-util/cmake/cmake-2.8.11.2.ebuild |
43 |
new file mode 100644 |
44 |
index 0000000..225bbcd |
45 |
--- /dev/null |
46 |
+++ b/dev-util/cmake/cmake-2.8.11.2.ebuild |
47 |
@@ -0,0 +1,199 @@ |
48 |
+# Copyright 1999-2013 Gentoo Foundation |
49 |
+# Distributed under the terms of the GNU General Public License v2 |
50 |
+# $Header: $ |
51 |
+ |
52 |
+EAPI=5 |
53 |
+ |
54 |
+CMAKE_REMOVE_MODULES="no" |
55 |
+inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
56 |
+ |
57 |
+MY_PV=${PV/_/-} |
58 |
+MY_P=${PN}-${MY_PV} |
59 |
+ |
60 |
+DESCRIPTION="Cross platform Make" |
61 |
+HOMEPAGE="http://www.cmake.org/" |
62 |
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" |
63 |
+ |
64 |
+LICENSE="CMake" |
65 |
+SLOT="0" |
66 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
67 |
+IUSE="emacs ncurses qt4 qt5 vim-syntax" |
68 |
+ |
69 |
+REQUIRED_USE="?? ( qt4 qt5 )" |
70 |
+ |
71 |
+DEPEND=" |
72 |
+ >=app-arch/libarchive-2.8.0:= |
73 |
+ >=dev-libs/expat-2.0.1 |
74 |
+ >=net-misc/curl-7.20.0-r1[ssl] |
75 |
+ sys-libs/zlib |
76 |
+ virtual/pkgconfig |
77 |
+ ncurses? ( sys-libs/ncurses ) |
78 |
+ qt4? ( |
79 |
+ dev-qt/qtcore:4 |
80 |
+ dev-qt/qtgui:4 |
81 |
+ ) |
82 |
+ qt5? ( |
83 |
+ dev-qt/qtcore:5 |
84 |
+ dev-qt/qtgui:5 |
85 |
+ dev-qt/qtwidgets:5 |
86 |
+ ) |
87 |
+" |
88 |
+RDEPEND="${DEPEND} |
89 |
+ emacs? ( virtual/emacs ) |
90 |
+ vim-syntax? ( |
91 |
+ || ( |
92 |
+ app-editors/vim |
93 |
+ app-editors/gvim |
94 |
+ ) |
95 |
+ ) |
96 |
+" |
97 |
+ |
98 |
+S="${WORKDIR}/${MY_P}" |
99 |
+ |
100 |
+SITEFILE="50${PN}-gentoo.el" |
101 |
+VIMFILE="${PN}.vim" |
102 |
+ |
103 |
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
104 |
+ |
105 |
+PATCHES=( |
106 |
+ "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch |
107 |
+ "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch |
108 |
+ "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch |
109 |
+ "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch |
110 |
+ "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
111 |
+ "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch |
112 |
+ "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch |
113 |
+ "${FILESDIR}"/${PN}-2.8.10-desktop.patch |
114 |
+ "${FILESDIR}"/${PN}-2.8.10-libform.patch |
115 |
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch |
116 |
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
117 |
+ "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch |
118 |
+ "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch |
119 |
+ "${FILESDIR}"/${PN}-2.8.11-FindImageMagick.patch |
120 |
+ "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch |
121 |
+) |
122 |
+ |
123 |
+cmake_src_bootstrap() { |
124 |
+ # Cleanup args to extract only JOBS. |
125 |
+ # Because bootstrap does not know anything else. |
126 |
+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
127 |
+ if [ $? -eq 0 ]; then |
128 |
+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
129 |
+ par_arg="--parallel=${par_arg}" |
130 |
+ else |
131 |
+ par_arg="--parallel=1" |
132 |
+ fi |
133 |
+ |
134 |
+ tc-export CC CXX LD |
135 |
+ |
136 |
+ # bootstrap script isn't exactly /bin/sh compatible |
137 |
+ ${CONFIG_SHELL:-sh} ./bootstrap \ |
138 |
+ --prefix="${T}/cmakestrap/" \ |
139 |
+ ${par_arg} \ |
140 |
+ || die "Bootstrap failed" |
141 |
+} |
142 |
+ |
143 |
+cmake_src_test() { |
144 |
+ # fix OutDir and SelectLibraryConfigurations tests |
145 |
+ # these are altered thanks to our eclass |
146 |
+ sed -i -e 's:#IGNORE ::g' \ |
147 |
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
148 |
+ || die |
149 |
+ |
150 |
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null |
151 |
+ |
152 |
+ local ctestargs |
153 |
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
154 |
+ |
155 |
+ # Excluded tests: |
156 |
+ # BootstrapTest: we actualy bootstrap it every time so why test it. |
157 |
+ # CTest.updatecvs, which fails to commit as root |
158 |
+ # Qt4Deploy, which tries to break sandbox and ignores prefix |
159 |
+ # TestUpload, which requires network access |
160 |
+ "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ |
161 |
+ -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ |
162 |
+ || die "Tests failed" |
163 |
+ |
164 |
+ popd > /dev/null |
165 |
+} |
166 |
+ |
167 |
+pkg_setup() { |
168 |
+ # bug 387227 |
169 |
+ addpredict /proc/self/coredump_filter |
170 |
+} |
171 |
+ |
172 |
+src_prepare() { |
173 |
+ cmake-utils_src_prepare |
174 |
+ |
175 |
+ # disable running of cmake in boostrap command |
176 |
+ sed -i \ |
177 |
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
178 |
+ bootstrap || die "sed failed" |
179 |
+ |
180 |
+ # Add gcc libs to the default link paths |
181 |
+ sed -i \ |
182 |
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
183 |
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
184 |
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
185 |
+ |
186 |
+ cmake_src_bootstrap |
187 |
+} |
188 |
+ |
189 |
+src_configure() { |
190 |
+ # make things work with gentoo java setup |
191 |
+ # in case java-config cannot be run, the variable just becomes unset |
192 |
+ # per bug #315229 |
193 |
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) |
194 |
+ |
195 |
+ local mycmakeargs=( |
196 |
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
197 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
198 |
+ -DCMAKE_DOC_DIR=/share/doc/${PF} |
199 |
+ -DCMAKE_MAN_DIR=/share/man |
200 |
+ -DCMAKE_DATA_DIR=/share/${PN} |
201 |
+ $(cmake-utils_use_build ncurses CursesDialog) |
202 |
+ ) |
203 |
+ |
204 |
+ if use qt4 || use qt5 ; then |
205 |
+ mycmakeargs+=( |
206 |
+ -DBUILD_QtDialog=ON |
207 |
+ $(cmake-utils_use_find_package qt5 Qt5Widgets) |
208 |
+ ) |
209 |
+ fi |
210 |
+ cmake-utils_src_configure |
211 |
+} |
212 |
+ |
213 |
+src_compile() { |
214 |
+ cmake-utils_src_compile |
215 |
+ use emacs && elisp-compile Docs/cmake-mode.el |
216 |
+} |
217 |
+ |
218 |
+src_test() { |
219 |
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake |
220 |
+} |
221 |
+ |
222 |
+src_install() { |
223 |
+ cmake-utils_src_install |
224 |
+ if use emacs; then |
225 |
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc |
226 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
227 |
+ fi |
228 |
+ if use vim-syntax; then |
229 |
+ insinto /usr/share/vim/vimfiles/syntax |
230 |
+ doins Docs/cmake-syntax.vim |
231 |
+ |
232 |
+ insinto /usr/share/vim/vimfiles/indent |
233 |
+ doins Docs/cmake-indent.vim |
234 |
+ |
235 |
+ insinto /usr/share/vim/vimfiles/ftdetect |
236 |
+ doins "${FILESDIR}/${VIMFILE}" |
237 |
+ fi |
238 |
+} |
239 |
+ |
240 |
+pkg_postinst() { |
241 |
+ use emacs && elisp-site-regen |
242 |
+} |
243 |
+ |
244 |
+pkg_postrm() { |
245 |
+ use emacs && elisp-site-regen |
246 |
+} |
247 |
|
248 |
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el |
249 |
new file mode 100644 |
250 |
index 0000000..e4a1a6d |
251 |
--- /dev/null |
252 |
+++ b/dev-util/cmake/files/50cmake-gentoo.el |
253 |
@@ -0,0 +1,4 @@ |
254 |
+(add-to-list 'load-path "@SITELISP@") |
255 |
+(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) |
256 |
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) |
257 |
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) |
258 |
|
259 |
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch |
260 |
new file mode 100644 |
261 |
index 0000000..02c3011 |
262 |
--- /dev/null |
263 |
+++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch |
264 |
@@ -0,0 +1,39 @@ |
265 |
+http://public.kitware.com/Bug/view.php?id=7933 |
266 |
+ |
267 |
+diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx |
268 |
+--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 |
269 |
++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 |
270 |
+@@ -38,6 +38,13 @@ |
271 |
+ int main() { return 0; } |
272 |
+ #endif |
273 |
+ |
274 |
++#ifdef TEST_KWSYS_LFS_SUPPORT |
275 |
++#define _LARGE_FILES |
276 |
++#include <iostream> |
277 |
++int main() { return 0; } |
278 |
++#endif |
279 |
++ |
280 |
++ |
281 |
+ #ifdef TEST_KWSYS_IOS_HAVE_STD |
282 |
+ #include <iosfwd> |
283 |
+ void f(std ::ostream*) {} |
284 |
+diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap |
285 |
+--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 |
286 |
++++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 |
287 |
+@@ -1005,6 +1005,16 @@ |
288 |
+ echo "${cmake_cxx_compiler} does not have stl iterator_traits" |
289 |
+ fi |
290 |
+ |
291 |
++if cmake_try_run "${cmake_cxx_compiler}" \ |
292 |
++ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ |
293 |
++ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then |
294 |
++ KWSYS_LFS_AVAILABLE=1 |
295 |
++ echo "LFS support available" |
296 |
++else |
297 |
++ KWSYS_LFS_AVAILABLE=0 |
298 |
++ echo "LFS support unavailable, disabled" |
299 |
++fi |
300 |
++ |
301 |
+ if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then |
302 |
+ if cmake_try_run "${cmake_cxx_compiler}" \ |
303 |
+ "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ |
304 |
|
305 |
diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch |
306 |
new file mode 100644 |
307 |
index 0000000..ceb205f |
308 |
--- /dev/null |
309 |
+++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch |
310 |
@@ -0,0 +1,19 @@ |
311 |
+Patch by Heiko Przybyl |
312 |
+ |
313 |
+--- Source/cmComputeLinkInformation.cxx |
314 |
++++ Source/cmComputeLinkInformation.cxx |
315 |
+@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge |
316 |
+ for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); |
317 |
+ ri != runtimeDirs.end(); ++ri) |
318 |
+ { |
319 |
++ // Do not add duplicates. |
320 |
++ // I'd like to have that check already in the list generation code |
321 |
++ // but that would need lots of more changes, even in ExpandListArgument(). |
322 |
++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) |
323 |
++ { |
324 |
++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; |
325 |
++ continue; |
326 |
++ } |
327 |
+ // Separate from previous path. |
328 |
+ rpath += sep; |
329 |
+ sep = this->GetRuntimeSep().c_str(); |
330 |
|
331 |
diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch |
332 |
new file mode 100644 |
333 |
index 0000000..4ef0c7b |
334 |
--- /dev/null |
335 |
+++ b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch |
336 |
@@ -0,0 +1,20 @@ |
337 |
+The install_name of a library can be compared to the ELF soname, setting |
338 |
+it to just the library name (libx.1.dylib) is not sufficient on Mach-O, |
339 |
+as it uses full paths. Most apps have no clue about that, so they don't |
340 |
+do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html |
341 |
+ |
342 |
+Provide a sane default that will allow merging most cmake-based |
343 |
+packages. If this location is not correct, Portage's QA checks will |
344 |
+catch that. |
345 |
+ |
346 |
+--- Source/cmTarget.cxx |
347 |
++++ Source/cmTarget.cxx |
348 |
+@@ -974,7 +974,7 @@ |
349 |
+ this->Makefile->IsOn("MINGW")); |
350 |
+ |
351 |
+ // Setup default property values. |
352 |
+- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); |
353 |
++ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); |
354 |
+ this->SetPropertyDefault("INSTALL_RPATH", ""); |
355 |
+ this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); |
356 |
+ this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); |
357 |
|
358 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch |
359 |
new file mode 100644 |
360 |
index 0000000..d4f18ff |
361 |
--- /dev/null |
362 |
+++ b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch |
363 |
@@ -0,0 +1,13 @@ |
364 |
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake |
365 |
+index 0a9a990..6a13d22 100644 |
366 |
+--- a/Modules/FindPythonLibs.cmake |
367 |
++++ b/Modules/FindPythonLibs.cmake |
368 |
+@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS) |
369 |
+ unset(_PYTHON2_VERSIONS) |
370 |
+ unset(_PYTHON3_VERSIONS) |
371 |
+ |
372 |
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" |
373 |
++ OUTPUT_VARIABLE _Python_VERSIONS) |
374 |
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS}) |
375 |
+ string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) |
376 |
+ if(WIN32) |
377 |
|
378 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch |
379 |
new file mode 100644 |
380 |
index 0000000..9cb4777 |
381 |
--- /dev/null |
382 |
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch |
383 |
@@ -0,0 +1,23 @@ |
384 |
+Don't use .so for modules on darwin/macos. Use .bundle instead. |
385 |
+Patch by Heiko Przybyl |
386 |
+ |
387 |
+--- Modules/Platform/Darwin.cmake |
388 |
++++ Modules/Platform/Darwin.cmake |
389 |
+@@ -26,7 +26,7 @@ |
390 |
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib") |
391 |
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") |
392 |
+ set(CMAKE_SHARED_MODULE_PREFIX "lib") |
393 |
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so") |
394 |
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") |
395 |
+ set(CMAKE_MODULE_EXISTS 1) |
396 |
+ set(CMAKE_DL_LIBS "") |
397 |
+ |
398 |
+@@ -48,7 +48,7 @@ |
399 |
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") |
400 |
+ set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") |
401 |
+ set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") |
402 |
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") |
403 |
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") |
404 |
+ |
405 |
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree |
406 |
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache |
407 |
|
408 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch |
409 |
new file mode 100644 |
410 |
index 0000000..97c93aa |
411 |
--- /dev/null |
412 |
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch |
413 |
@@ -0,0 +1,50 @@ |
414 |
+Do not detect Xcode and set -isysroot for its SDK, since that messes up |
415 |
+our toolchain, and hence makes any compilation fail, bug #445308 |
416 |
+ |
417 |
+--- Modules/Platform/Darwin.cmake |
418 |
++++ Modules/Platform/Darwin.cmake |
419 |
+@@ -60,18 +60,18 @@ |
420 |
+ endif() |
421 |
+ |
422 |
+ # Ask xcode-select where to find /Developer or fall back to ancient location. |
423 |
+-execute_process(COMMAND xcode-select -print-path |
424 |
+- OUTPUT_VARIABLE _stdout |
425 |
+- OUTPUT_STRIP_TRAILING_WHITESPACE |
426 |
+- ERROR_VARIABLE _stderr |
427 |
+- RESULT_VARIABLE _failed) |
428 |
+-if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
429 |
+- set(OSX_DEVELOPER_ROOT ${_stdout}) |
430 |
+-elseif(IS_DIRECTORY "/Developer") |
431 |
+- set(OSX_DEVELOPER_ROOT "/Developer") |
432 |
+-else() |
433 |
++#execute_process(COMMAND xcode-select -print-path |
434 |
++# OUTPUT_VARIABLE _stdout |
435 |
++# OUTPUT_STRIP_TRAILING_WHITESPACE |
436 |
++# ERROR_VARIABLE _stderr |
437 |
++# RESULT_VARIABLE _failed) |
438 |
++#if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
439 |
++# set(OSX_DEVELOPER_ROOT ${_stdout}) |
440 |
++#elseif(IS_DIRECTORY "/Developer") |
441 |
++# set(OSX_DEVELOPER_ROOT "/Developer") |
442 |
++#else() |
443 |
+ set(OSX_DEVELOPER_ROOT "") |
444 |
+-endif() |
445 |
++#endif() |
446 |
+ |
447 |
+ execute_process(COMMAND sw_vers -productVersion |
448 |
+ OUTPUT_VARIABLE CURRENT_OSX_VERSION |
449 |
+@@ -91,10 +91,10 @@ |
450 |
+ # CMAKE_OSX_DEPLOYMENT_TARGET |
451 |
+ |
452 |
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure. |
453 |
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
454 |
+- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
455 |
+- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
456 |
+-endif() |
457 |
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
458 |
++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
459 |
++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
460 |
++#endif() |
461 |
+ |
462 |
+ #---------------------------------------------------------------------------- |
463 |
+ # CMAKE_OSX_SYSROOT |
464 |
|
465 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch |
466 |
new file mode 100644 |
467 |
index 0000000..e0cefa9 |
468 |
--- /dev/null |
469 |
+++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch |
470 |
@@ -0,0 +1,13 @@ |
471 |
+diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop |
472 |
+index 645eb76..7be495f 100644 |
473 |
+--- a/Source/QtDialog/CMake.desktop |
474 |
++++ b/Source/QtDialog/CMake.desktop |
475 |
+@@ -3,7 +3,7 @@ Version=1.0 |
476 |
+ Name=CMake |
477 |
+ Comment=Cross-platform buildsystem |
478 |
+ Exec=cmake-gui %f |
479 |
+-Icon=CMakeSetup32.png |
480 |
++Icon=CMakeSetup32 |
481 |
+ Terminal=false |
482 |
+ X-MultipleArgs=false |
483 |
+ Type=Application |
484 |
|
485 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch |
486 |
new file mode 100644 |
487 |
index 0000000..052cc30 |
488 |
--- /dev/null |
489 |
+++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch |
490 |
@@ -0,0 +1,51 @@ |
491 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
492 |
+index ea1c033..ae479ce 100644 |
493 |
+--- a/CMakeLists.txt |
494 |
++++ b/CMakeLists.txt |
495 |
+@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) |
496 |
+ else () |
497 |
+ set(BUILD_CursesDialog 0) |
498 |
+ endif () |
499 |
+- if(BUILD_CursesDialog) |
500 |
+- add_subdirectory(Source/CursesDialog/form) |
501 |
+- endif() |
502 |
+ endmacro () |
503 |
+ |
504 |
+ #----------------------------------------------------------------------- |
505 |
+diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt |
506 |
+index 96e28b4..4102379 100644 |
507 |
+--- a/Source/CursesDialog/CMakeLists.txt |
508 |
++++ b/Source/CursesDialog/CMakeLists.txt |
509 |
+@@ -25,13 +25,16 @@ set( CURSES_SRCS |
510 |
+ CursesDialog/ccmake |
511 |
+ ) |
512 |
+ |
513 |
+-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form |
514 |
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form) |
515 |
+ include_directories(${CURSES_INCLUDE_PATH}) |
516 |
+ |
517 |
+ |
518 |
+ add_executable(ccmake ${CURSES_SRCS} ) |
519 |
+ target_link_libraries(ccmake CMakeLib) |
520 |
+-target_link_libraries(ccmake cmForm) |
521 |
++TARGET_LINK_LIBRARIES(ccmake form) |
522 |
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) |
523 |
++IF(CURSES_EXTRA_LIBRARY) |
524 |
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) |
525 |
++ENDIF(CURSES_EXTRA_LIBRARY) |
526 |
++ |
527 |
+ |
528 |
+ install_targets(/bin ccmake) |
529 |
+diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h |
530 |
+index b157a28..f131ea4 100644 |
531 |
+--- a/Source/CursesDialog/cmCursesStandardIncludes.h |
532 |
++++ b/Source/CursesDialog/cmCursesStandardIncludes.h |
533 |
+@@ -15,8 +15,6 @@ |
534 |
+ #define _MSE_INT_H |
535 |
+ #endif |
536 |
+ |
537 |
+-#include <cmFormConfigure.h> |
538 |
+- |
539 |
+ #if defined(__hpux) |
540 |
+ # define _BOOL_DEFINED |
541 |
+ # include <sys/time.h> |
542 |
|
543 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch |
544 |
new file mode 100644 |
545 |
index 0000000..88927a3 |
546 |
--- /dev/null |
547 |
+++ b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch |
548 |
@@ -0,0 +1,134 @@ |
549 |
+From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 |
550 |
+From: Michael Palimaka <kensington@g.o> |
551 |
+Date: Tue, 6 Nov 2012 23:35:34 +1100 |
552 |
+Subject: [PATCH] Set some proper paths to make cmake find our tools. |
553 |
+ |
554 |
+The ebuild now adds an extra / at the end of $EPREFIX so that it is |
555 |
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains |
556 |
+correct) |
557 |
+ |
558 |
+Original patch by Heiko Przybyl. |
559 |
+Updated by Chris Reffett (cmake-2.8.8) |
560 |
+Updated by Johannes Huber (cmake-2.8.9) |
561 |
+Updated by Michael Palimaka (cmake-2.8.10) |
562 |
+--- |
563 |
+ Modules/Platform/Darwin.cmake | 12 +++++++---- |
564 |
+ Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++-------------------- |
565 |
+ 2 files changed, 29 insertions(+), 26 deletions(-) |
566 |
+ |
567 |
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake |
568 |
+index a401762..775e547 100644 |
569 |
+--- a/Modules/Platform/Darwin.cmake |
570 |
++++ b/Modules/Platform/Darwin.cmake |
571 |
+@@ -251,24 +251,28 @@ set(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK |
572 |
+ "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>") |
573 |
+ |
574 |
+ |
575 |
+-# default to searching for frameworks first |
576 |
++# default to searching for frameworks last |
577 |
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK) |
578 |
+- set(CMAKE_FIND_FRAMEWORK FIRST) |
579 |
++ set(CMAKE_FIND_FRAMEWORK LAST) |
580 |
+ endif() |
581 |
+ # set up the default search directories for frameworks |
582 |
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH |
583 |
++ @GENTOO_PORTAGE_EPREFIX@Frameworks |
584 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
585 |
+ ~/Library/Frameworks |
586 |
+ /Library/Frameworks |
587 |
+ /Network/Library/Frameworks |
588 |
+ /System/Library/Frameworks) |
589 |
+ |
590 |
+-# default to searching for application bundles first |
591 |
++# default to searching for application bundles last |
592 |
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE) |
593 |
+- set(CMAKE_FIND_APPBUNDLE FIRST) |
594 |
++ set(CMAKE_FIND_APPBUNDLE LAST) |
595 |
+ endif() |
596 |
+ # set up the default search directories for application bundles |
597 |
+ set(_apps_paths) |
598 |
+ foreach(_path |
599 |
++ @GENTOO_PORTAGE_EPREFIX@Applications |
600 |
++ @GENTOO_PORTAGE_EPREFIX@usr/bin |
601 |
+ "~/Applications" |
602 |
+ "/Applications" |
603 |
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ |
604 |
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake |
605 |
+index ccb2663..0501d53 100644 |
606 |
+--- a/Modules/Platform/UnixPaths.cmake |
607 |
++++ b/Modules/Platform/UnixPaths.cmake |
608 |
+@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) |
609 |
+ # search types. |
610 |
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH |
611 |
+ # Standard |
612 |
++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ |
613 |
+ /usr/local /usr / |
614 |
+ |
615 |
+ # CMake install location |
616 |
+@@ -44,43 +45,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH |
617 |
+ |
618 |
+ # List common include file locations not under the common prefixes. |
619 |
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH |
620 |
+- # Windows API on Cygwin |
621 |
+- /usr/include/w32api |
622 |
+- |
623 |
+- # X11 |
624 |
+- /usr/X11R6/include /usr/include/X11 |
625 |
+- |
626 |
+- # Other |
627 |
+- /usr/pkg/include |
628 |
+- /opt/csw/include /opt/include |
629 |
+- /usr/openwin/include |
630 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
631 |
+ ) |
632 |
+ |
633 |
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH |
634 |
+- # Windows API on Cygwin |
635 |
+- /usr/lib/w32api |
636 |
+- |
637 |
+- # X11 |
638 |
+- /usr/X11R6/lib /usr/lib/X11 |
639 |
+- |
640 |
+- # Other |
641 |
+- /usr/pkg/lib |
642 |
+- /opt/csw/lib /opt/lib |
643 |
+- /usr/openwin/lib |
644 |
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
645 |
++ @GENTOO_PORTAGE_GCCLIBDIR@ |
646 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
647 |
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
648 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
649 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
650 |
++ @GENTOO_PORTAGE_EPREFIX@lib |
651 |
+ ) |
652 |
+ |
653 |
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH |
654 |
+- /usr/pkg/bin |
655 |
++ @GENTOO_PORTAGE_EPREFIX@usr/bin |
656 |
++ @GENTOO_PORTAGE_EPREFIX@bin |
657 |
+ ) |
658 |
+ |
659 |
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES |
660 |
+- /lib /usr/lib /usr/lib32 /usr/lib64 |
661 |
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
662 |
++ @GENTOO_PORTAGE_GCCLIBDIR@ |
663 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
664 |
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
665 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
666 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
667 |
++ @GENTOO_PORTAGE_EPREFIX@lib |
668 |
++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 |
669 |
+ ) |
670 |
+ |
671 |
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES |
672 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
673 |
+ /usr/include |
674 |
+ ) |
675 |
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES |
676 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
677 |
+ /usr/include |
678 |
+ ) |
679 |
+ |
680 |
+-- |
681 |
+1.8.0 |
682 |
+ |
683 |
|
684 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch |
685 |
new file mode 100644 |
686 |
index 0000000..944e3c5 |
687 |
--- /dev/null |
688 |
+++ b/dev-util/cmake/files/cmake-2.8.10-tests.patch |
689 |
@@ -0,0 +1,83 @@ |
690 |
+Removes the following tests: |
691 |
+ |
692 |
+- DeployQt4, which tries to break sandbox and ignores prefix |
693 |
+- CTest.updatecvs, which fails to commit as root |
694 |
+- TestUpload, which requires network access |
695 |
+ |
696 |
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt |
697 |
+index b404333..50f4292 100644 |
698 |
+--- a/Tests/CMakeLists.txt |
699 |
++++ b/Tests/CMakeLists.txt |
700 |
+@@ -271,23 +271,6 @@ if(BUILD_TESTING) |
701 |
+ ) |
702 |
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") |
703 |
+ |
704 |
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) |
705 |
+- # this test also depends on the existence of the standard qtiff plugin |
706 |
+- if(QT4_WORKS AND QT_QTSQL_FOUND) |
707 |
+- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND} |
708 |
+- --build-and-test |
709 |
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" |
710 |
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" |
711 |
+- --build-generator ${CMAKE_TEST_GENERATOR} |
712 |
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} |
713 |
+- --build-project Qt4Deploy |
714 |
+- --build-options |
715 |
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} |
716 |
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} |
717 |
+- ) |
718 |
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy") |
719 |
+- endif() |
720 |
+- |
721 |
+ endif() |
722 |
+ endif() |
723 |
+ |
724 |
+@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ |
725 |
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}") |
726 |
+ endif() |
727 |
+ |
728 |
+- # Test CTest Update with CVS |
729 |
+- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) |
730 |
+- find_package(CVS QUIET) |
731 |
+- else() |
732 |
+- find_program(CVS_EXECUTABLE NAMES cvs) |
733 |
+- set(CVS_FOUND ${CVS_EXECUTABLE}) |
734 |
+- endif() |
735 |
+- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) |
736 |
+- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX) |
737 |
+- if("${CVS_EXECUTABLE}" MATCHES "cygwin") |
738 |
+- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!") |
739 |
+- set(CTEST_TEST_UPDATE_CVS 0) |
740 |
+- endif() |
741 |
+- endif() |
742 |
+- if(CTEST_TEST_UPDATE_CVS) |
743 |
+- set(CTestUpdateCVS_DIR "CTest UpdateCVS") |
744 |
+- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in" |
745 |
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) |
746 |
+- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} |
747 |
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" |
748 |
+- ) |
749 |
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}") |
750 |
+- endif() |
751 |
+- |
752 |
+ # Test CTest Update with BZR |
753 |
+ find_program(BZR_EXECUTABLE NAMES bzr) |
754 |
+ mark_as_advanced(BZR_EXECUTABLE) |
755 |
+@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ |
756 |
+ FAIL_REGULAR_EXPRESSION "SegFault") |
757 |
+ |
758 |
+ configure_file( |
759 |
+- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" |
760 |
+- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" |
761 |
+- @ONLY ESCAPE_QUOTES) |
762 |
+- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} |
763 |
+- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V |
764 |
+- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" |
765 |
+- ) |
766 |
+- set_tests_properties(CTestTestUpload PROPERTIES |
767 |
+- PASS_REGULAR_EXPRESSION "Upload\\.xml") |
768 |
+- |
769 |
+- configure_file( |
770 |
+ "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in" |
771 |
+ "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake" |
772 |
+ @ONLY ESCAPE_QUOTES) |
773 |
|
774 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch |
775 |
new file mode 100644 |
776 |
index 0000000..6a79a58 |
777 |
--- /dev/null |
778 |
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch |
779 |
@@ -0,0 +1,34 @@ |
780 |
+http://bugs.gentoo.org/465898 |
781 |
+ |
782 |
+--- Modules/FindImageMagick.cmake |
783 |
++++ Modules/FindImageMagick.cmake |
784 |
+@@ -81,7 +81,7 @@ |
785 |
+ ${ImageMagick_INCLUDE_DIRS} |
786 |
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" |
787 |
+ PATH_SUFFIXES |
788 |
+- ImageMagick |
789 |
++ ImageMagick ImageMagick-6 |
790 |
+ DOC "Path to the ImageMagick include dir." |
791 |
+ ) |
792 |
+ find_library(ImageMagick_${component}_LIBRARY |
793 |
+@@ -147,17 +147,17 @@ |
794 |
+ ) |
795 |
+ if(component STREQUAL "Magick++") |
796 |
+ FIND_IMAGEMAGICK_API(Magick++ Magick++.h |
797 |
+- Magick++ CORE_RL_Magick++_ |
798 |
++ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI |
799 |
+ ) |
800 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) |
801 |
+ elseif(component STREQUAL "MagickWand") |
802 |
+ FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h |
803 |
+- Wand MagickWand CORE_RL_wand_ |
804 |
++ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI |
805 |
+ ) |
806 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) |
807 |
+ elseif(component STREQUAL "MagickCore") |
808 |
+ FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h |
809 |
+- Magick MagickCore CORE_RL_magick_ |
810 |
++ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI |
811 |
+ ) |
812 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) |
813 |
+ else() |
814 |
|
815 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch |
816 |
new file mode 100644 |
817 |
index 0000000..a7e8688 |
818 |
--- /dev/null |
819 |
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch |
820 |
@@ -0,0 +1,22 @@ |
821 |
+--- Modules/FindPythonInterp.cmake |
822 |
++++ Modules/FindPythonInterp.cmake |
823 |
+@@ -60,6 +60,10 @@ |
824 |
+ |
825 |
+ list(APPEND _Python_NAMES python) |
826 |
+ |
827 |
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) |
828 |
++ set(_Python_NAMES python) |
829 |
++endif() |
830 |
++ |
831 |
+ # Search for the current active python version first |
832 |
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) |
833 |
+ |
834 |
+@@ -76,7 +80,7 @@ |
835 |
+ unset(_PYTHON3_VERSIONS) |
836 |
+ |
837 |
+ # Search for newest python version if python executable isn't found |
838 |
+-if(NOT PYTHON_EXECUTABLE) |
839 |
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) |
840 |
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS}) |
841 |
+ set(_Python_NAMES python${_CURRENT_VERSION}) |
842 |
+ if(WIN32) |
843 |
|
844 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch |
845 |
new file mode 100644 |
846 |
index 0000000..80cc4d3 |
847 |
--- /dev/null |
848 |
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch |
849 |
@@ -0,0 +1,24 @@ |
850 |
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake |
851 |
+index bffa9fb..8fc90ee 100644 |
852 |
+--- a/Modules/FindPythonLibs.cmake |
853 |
++++ b/Modules/FindPythonLibs.cmake |
854 |
+@@ -74,6 +74,19 @@ set(_Python_VERSIONS |
855 |
+ ${_PYTHON_FIND_OTHER_VERSIONS} |
856 |
+ ) |
857 |
+ |
858 |
++# Gentoo portage requires that you use exactly the given python version |
859 |
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) |
860 |
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" |
861 |
++ OUTPUT_VARIABLE _Gentoo_Python_VERSION) |
862 |
++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) |
863 |
++ if (_Gentoo_Python_INDEX EQUAL -1) |
864 |
++ # the current Gentoo python version is not compatible with what is requested |
865 |
++ set(_Python_VERSIONS) |
866 |
++ else () |
867 |
++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") |
868 |
++ endif () |
869 |
++endif() |
870 |
++ |
871 |
+ unset(_PYTHON_FIND_OTHER_VERSIONS) |
872 |
+ unset(_PYTHON1_VERSIONS) |
873 |
+ unset(_PYTHON2_VERSIONS) |
874 |
|
875 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch |
876 |
new file mode 100644 |
877 |
index 0000000..f0ea5e8 |
878 |
--- /dev/null |
879 |
+++ b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch |
880 |
@@ -0,0 +1,139 @@ |
881 |
+--- a/Source/cmLocalGenerator.cxx |
882 |
++++ b/Source/cmLocalGenerator.cxx |
883 |
+@@ -1329,7 +1329,9 @@ std::string cmLocalGenerator::GetIncludeFlags( |
884 |
+ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, |
885 |
+ cmGeneratorTarget* target, |
886 |
+ const char* lang, |
887 |
+- const char *config) |
888 |
++ const char *config, |
889 |
++ bool stripImplicitInclDirs |
890 |
++ ) |
891 |
+ { |
892 |
+ // Need to decide whether to automatically include the source and |
893 |
+ // binary directories at the beginning of the include path. |
894 |
+@@ -1404,18 +1406,21 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, |
895 |
+ return; |
896 |
+ } |
897 |
+ |
898 |
+- // Load implicit include directories for this language. |
899 |
+- std::string impDirVar = "CMAKE_"; |
900 |
+- impDirVar += lang; |
901 |
+- impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES"; |
902 |
+- if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str())) |
903 |
++ if (stripImplicitInclDirs) |
904 |
+ { |
905 |
+- std::vector<std::string> impDirVec; |
906 |
+- cmSystemTools::ExpandListArgument(value, impDirVec); |
907 |
+- for(std::vector<std::string>::const_iterator i = impDirVec.begin(); |
908 |
+- i != impDirVec.end(); ++i) |
909 |
++ // Load implicit include directories for this language. |
910 |
++ std::string impDirVar = "CMAKE_"; |
911 |
++ impDirVar += lang; |
912 |
++ impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES"; |
913 |
++ if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str())) |
914 |
+ { |
915 |
+- emitted.insert(*i); |
916 |
++ std::vector<std::string> impDirVec; |
917 |
++ cmSystemTools::ExpandListArgument(value, impDirVec); |
918 |
++ for(std::vector<std::string>::const_iterator i = impDirVec.begin(); |
919 |
++ i != impDirVec.end(); ++i) |
920 |
++ { |
921 |
++ emitted.insert(*i); |
922 |
++ } |
923 |
+ } |
924 |
+ } |
925 |
+ |
926 |
+--- a/Source/cmLocalGenerator.h |
927 |
++++ b/Source/cmLocalGenerator.h |
928 |
+@@ -212,7 +212,8 @@ public: |
929 |
+ /** Get the include flags for the current makefile and language. */ |
930 |
+ void GetIncludeDirectories(std::vector<std::string>& dirs, |
931 |
+ cmGeneratorTarget* target, |
932 |
+- const char* lang = "C", const char *config = 0); |
933 |
++ const char* lang = "C", const char *config = 0, |
934 |
++ bool stripImplicitInclDirs = true); |
935 |
+ |
936 |
+ /** Compute the language used to compile the given source file. */ |
937 |
+ const char* GetSourceFileLanguage(const cmSourceFile& source); |
938 |
+--- a/Source/cmQtAutomoc.cxx |
939 |
++++ b/Source/cmQtAutomoc.cxx |
940 |
+@@ -212,36 +212,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) |
941 |
+ } |
942 |
+ |
943 |
+ |
944 |
+- const char* qtIncDir = 0; |
945 |
+- const char* qtCoreIncDir = 0; |
946 |
+- |
947 |
+- // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs, |
948 |
+- // see http://public.kitware.com/Bug/view.php?id=13667 |
949 |
+- bool qtIncludeDirMayHaveBeenRemoved = false; |
950 |
+- if (makefile->IsSet("QT_INCLUDE_DIR")) |
951 |
+- { |
952 |
+- qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR"); |
953 |
+- std::string s = |
954 |
+- makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES"); |
955 |
+- std::vector<std::string> implIncDirs; |
956 |
+- cmSystemTools::ExpandListArgument(s, implIncDirs); |
957 |
+- if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir)) |
958 |
+- != implIncDirs.end()) |
959 |
+- { |
960 |
+- qtIncludeDirMayHaveBeenRemoved = true; |
961 |
+- if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR")) |
962 |
+- { |
963 |
+- qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR"); |
964 |
+- } |
965 |
+- } |
966 |
+- } |
967 |
+- |
968 |
+- bool haveQtCoreIncDir = false; |
969 |
+- bool haveQtIncDir = false; |
970 |
+- |
971 |
+ std::vector<std::string> includeDirs; |
972 |
+ cmGeneratorTarget gtgt(target); |
973 |
+- localGen->GetIncludeDirectories(includeDirs, >gt, "CXX"); |
974 |
++ // Get the include dirs for this target, without stripping the implicit |
975 |
++ // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667 |
976 |
++ localGen->GetIncludeDirectories(includeDirs, >gt, "CXX", 0, false); |
977 |
+ std::string _moc_incs = ""; |
978 |
+ const char* sep = ""; |
979 |
+ for(std::vector<std::string>::const_iterator incDirIt = includeDirs.begin(); |
980 |
+@@ -251,37 +226,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) |
981 |
+ _moc_incs += sep; |
982 |
+ sep = ";"; |
983 |
+ _moc_incs += *incDirIt; |
984 |
+- |
985 |
+- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667 |
986 |
+- { |
987 |
+- if (*incDirIt == qtIncDir) |
988 |
+- { |
989 |
+- haveQtIncDir = true; |
990 |
+- qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed |
991 |
+- } |
992 |
+- if (*incDirIt == qtCoreIncDir) |
993 |
+- { |
994 |
+- haveQtCoreIncDir = true; |
995 |
+- } |
996 |
+- } |
997 |
+- } |
998 |
+- |
999 |
+- // Some projects (kdelibs, phonon) query the compiler for its default |
1000 |
+- // include search dirs, and add those to |
1001 |
+- // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES. |
1002 |
+- // These may include e.g./usr/lib/qt/include . This is typically also part |
1003 |
+- // of ${QT_INCLUDES}. If this directory is then contained in the implicit |
1004 |
+- // include dirs, it is removed from the include dirs returned from the |
1005 |
+- // target above. So we add ${QT_INCLUDE_DIR} manually for moc if we detected |
1006 |
+- // that ${QT_QTCORE_INCLUDE_DIR} is among the include dirs (there shouldn't |
1007 |
+- // be a way to use Qt4 without using ${QT_QTCORE_INCLUDE_DIR} I think. |
1008 |
+- // See #13646 and #13667. |
1009 |
+- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir |
1010 |
+- && (haveQtCoreIncDir == true) && (haveQtIncDir == false)) |
1011 |
+- { |
1012 |
+- _moc_incs += sep; |
1013 |
+- sep = ";"; |
1014 |
+- _moc_incs += qtIncDir; |
1015 |
+ } |
1016 |
+ |
1017 |
+ const char* tmp = target->GetProperty("COMPILE_DEFINITIONS"); |
1018 |
+-- |
1019 |
+1.7.0 |
1020 |
|
1021 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch |
1022 |
new file mode 100644 |
1023 |
index 0000000..1f2bef0 |
1024 |
--- /dev/null |
1025 |
+++ b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch |
1026 |
@@ -0,0 +1,16 @@ |
1027 |
+--- Source/QtDoalog/CMakeLists.txt |
1028 |
++++ Source/QtDialog/CMakeLists.txt |
1029 |
+@@ -11,7 +11,12 @@ |
1030 |
+ #============================================================================= |
1031 |
+ |
1032 |
+ project(QtDialog) |
1033 |
+-find_package(Qt5Widgets QUIET) |
1034 |
++option(WITH_Qt5 ON) |
1035 |
++ |
1036 |
++if(WITH_Qt5) |
1037 |
++ find_package(Qt5Widgets QUIET) |
1038 |
++endif() |
1039 |
++ |
1040 |
+ if (Qt5Widgets_FOUND) |
1041 |
+ include_directories(${Qt5Widgets_INCLUDE_DIRS}) |
1042 |
+ add_definitions(${Qt5Widgets_DEFINITONS}) |
1043 |
|
1044 |
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch |
1045 |
new file mode 100644 |
1046 |
index 0000000..02e44fb |
1047 |
--- /dev/null |
1048 |
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch |
1049 |
@@ -0,0 +1,48 @@ |
1050 |
+--- b/Modules/FindBLAS.cmake |
1051 |
++++ a/Modules/FindBLAS.cmake |
1052 |
+@@ -1,3 +1,9 @@ |
1053 |
++# |
1054 |
++# Version modified for Gentoo Linux |
1055 |
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels |
1056 |
++# all further checks. |
1057 |
++# |
1058 |
++ |
1059 |
+ # - Find BLAS library |
1060 |
+ # This module finds an installed fortran library that implements the BLAS |
1061 |
+ # linear-algebra interface (see http://www.netlib.org/blas/). |
1062 |
+@@ -40,6 +46,26 @@ |
1063 |
+ # (To distribute this file outside of CMake, substitute the full |
1064 |
+ # License text for the above reference.) |
1065 |
+ |
1066 |
++# |
1067 |
++# first, try PkgConfig |
1068 |
++# |
1069 |
++find_package(PkgConfig REQUIRED) |
1070 |
++pkg_check_modules(PC_BLAS blas) |
1071 |
++if(PC_BLAS_FOUND) |
1072 |
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) |
1073 |
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) |
1074 |
++ if (NOT ${PC_LIB}_LIBRARY) |
1075 |
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") |
1076 |
++ endif (NOT ${PC_LIB}_LIBRARY) |
1077 |
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) |
1078 |
++ endforeach(PC_LIB) |
1079 |
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) |
1080 |
++ mark_as_advanced(BLAS_LIBRARIES) |
1081 |
++else(PC_BLAS_FOUND) |
1082 |
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") |
1083 |
++ |
1084 |
++ |
1085 |
++ |
1086 |
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) |
1087 |
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) |
1088 |
+ |
1089 |
+@@ -604,3 +630,8 @@ |
1090 |
+ endif() |
1091 |
+ |
1092 |
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
1093 |
++ |
1094 |
++ |
1095 |
++endif(PC_BLAS_FOUND) |
1096 |
++ |
1097 |
++ |
1098 |
|
1099 |
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch |
1100 |
new file mode 100644 |
1101 |
index 0000000..b00b4f7 |
1102 |
--- /dev/null |
1103 |
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch |
1104 |
@@ -0,0 +1,73 @@ |
1105 |
+--- Modules/FindBoost.cmake |
1106 |
++++ Modules/FindBoost.cmake |
1107 |
+@@ -903,6 +903,11 @@ |
1108 |
+ |
1109 |
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)") |
1110 |
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") |
1111 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1112 |
++ # Get version of Python. |
1113 |
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) |
1114 |
++ endif() |
1115 |
++ |
1116 |
+ |
1117 |
+ # |
1118 |
+ # Find RELEASE libraries |
1119 |
+@@ -913,6 +918,14 @@ |
1120 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
1121 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
1122 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
1123 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1124 |
++ list(APPEND _boost_RELEASE_NAMES |
1125 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
1126 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
1127 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
1128 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
1129 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) |
1130 |
++ endif() |
1131 |
+ if(_boost_STATIC_RUNTIME_WORKAROUND) |
1132 |
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") |
1133 |
+ list(APPEND _boost_RELEASE_NAMES |
1134 |
+@@ -920,6 +933,13 @@ |
1135 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
1136 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1137 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
1138 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1139 |
++ list(APPEND _boost_RELEASE_NAMES |
1140 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1141 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
1142 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1143 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
1144 |
++ endif() |
1145 |
+ endif() |
1146 |
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
1147 |
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) |
1148 |
+@@ -945,6 +965,15 @@ |
1149 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
1150 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} |
1151 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
1152 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1153 |
++ list(APPEND _boost_DEBUG_NAMES |
1154 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
1155 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
1156 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
1157 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
1158 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} |
1159 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) |
1160 |
++ endif() |
1161 |
+ if(_boost_STATIC_RUNTIME_WORKAROUND) |
1162 |
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") |
1163 |
+ list(APPEND _boost_DEBUG_NAMES |
1164 |
+@@ -952,6 +981,13 @@ |
1165 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
1166 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1167 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
1168 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1169 |
++ list(APPEND _boost_DEBUG_NAMES |
1170 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1171 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
1172 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1173 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
1174 |
++ endif() |
1175 |
+ endif() |
1176 |
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
1177 |
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) |
1178 |
|
1179 |
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch |
1180 |
new file mode 100644 |
1181 |
index 0000000..f5b70c1 |
1182 |
--- /dev/null |
1183 |
+++ b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch |
1184 |
@@ -0,0 +1,34 @@ |
1185 |
+http://bugs.gentoo.org/show_bug.cgi?id=465898 |
1186 |
+ |
1187 |
+--- Modules/FindImageMagick.cmake |
1188 |
++++ Modules/FindImageMagick.cmake |
1189 |
+@@ -81,7 +81,7 @@ |
1190 |
+ ${ImageMagick_INCLUDE_DIRS} |
1191 |
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" |
1192 |
+ PATH_SUFFIXES |
1193 |
+- ImageMagick |
1194 |
++ ImageMagick ImageMagick-6 |
1195 |
+ DOC "Path to the ImageMagick include dir." |
1196 |
+ ) |
1197 |
+ find_library(ImageMagick_${component}_LIBRARY |
1198 |
+@@ -147,17 +147,17 @@ |
1199 |
+ ) |
1200 |
+ if(component STREQUAL "Magick++") |
1201 |
+ FIND_IMAGEMAGICK_API(Magick++ Magick++.h |
1202 |
+- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 |
1203 |
++ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI |
1204 |
+ ) |
1205 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) |
1206 |
+ elseif(component STREQUAL "MagickWand") |
1207 |
+ FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h |
1208 |
+- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 |
1209 |
++ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI |
1210 |
+ ) |
1211 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) |
1212 |
+ elseif(component STREQUAL "MagickCore") |
1213 |
+ FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h |
1214 |
+- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 |
1215 |
++ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI |
1216 |
+ ) |
1217 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) |
1218 |
+ else() |
1219 |
|
1220 |
diff --git a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch |
1221 |
new file mode 100644 |
1222 |
index 0000000..36f4ded |
1223 |
--- /dev/null |
1224 |
+++ b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch |
1225 |
@@ -0,0 +1,130 @@ |
1226 |
+From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 |
1227 |
+From: Michael Palimaka <kensington@g.o> |
1228 |
+Date: Tue, 6 Nov 2012 23:35:34 +1100 |
1229 |
+Subject: [PATCH] Set some proper paths to make cmake find our tools. |
1230 |
+ |
1231 |
+The ebuild now adds an extra / at the end of $EPREFIX so that it is |
1232 |
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains |
1233 |
+correct) |
1234 |
+ |
1235 |
+Original patch by Heiko Przybyl. |
1236 |
+Updated by Chris Reffett (cmake-2.8.8) |
1237 |
+Updated by Johannes Huber (cmake-2.8.9) |
1238 |
+Updated by Michael Palimaka (cmake-2.8.10) |
1239 |
+Updated by Chris Reffett (cmake-2.8.11) |
1240 |
+ |
1241 |
+--- a/Modules/Platform/Darwin.cmake |
1242 |
++++ b/Modules/Platform/Darwin.cmake |
1243 |
+@@ -252,9 +252,9 @@ |
1244 |
+ "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>") |
1245 |
+ |
1246 |
+ |
1247 |
+-# default to searching for frameworks first |
1248 |
++# default to searching for frameworks last |
1249 |
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK) |
1250 |
+- set(CMAKE_FIND_FRAMEWORK FIRST) |
1251 |
++ set(CMAKE_FIND_FRAMEWORK LAST) |
1252 |
+ endif() |
1253 |
+ |
1254 |
+ # Older OS X linkers do not report their framework search path |
1255 |
+@@ -276,6 +276,8 @@ |
1256 |
+ |
1257 |
+ # set up the default search directories for frameworks |
1258 |
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH |
1259 |
++ @GENTOO_PORTAGE_EPREFIX@Frameworks |
1260 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
1261 |
+ ~/Library/Frameworks |
1262 |
+ /Library/Frameworks |
1263 |
+ /Network/Library/Frameworks |
1264 |
+@@ -298,13 +300,15 @@ |
1265 |
+ endif() |
1266 |
+ endif() |
1267 |
+ |
1268 |
+-# default to searching for application bundles first |
1269 |
++# default to searching for application bundles last |
1270 |
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE) |
1271 |
+- set(CMAKE_FIND_APPBUNDLE FIRST) |
1272 |
++ set(CMAKE_FIND_APPBUNDLE LAST) |
1273 |
+ endif() |
1274 |
+ # set up the default search directories for application bundles |
1275 |
+ set(_apps_paths) |
1276 |
+ foreach(_path |
1277 |
++ @GENTOO_PORTAGE_EPREFIX@Applications |
1278 |
++ @GENTOO_PORTAGE_EPREFIX@usr/bin |
1279 |
+ "~/Applications" |
1280 |
+ "/Applications" |
1281 |
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ |
1282 |
+--- a/Modules/Platform/UnixPaths.cmake |
1283 |
++++ b/Modules/Platform/UnixPaths.cmake |
1284 |
+@@ -33,6 +33,7 @@ |
1285 |
+ # search types. |
1286 |
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH |
1287 |
+ # Standard |
1288 |
++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ |
1289 |
+ /usr/local /usr / |
1290 |
+ |
1291 |
+ # CMake install location |
1292 |
+@@ -44,43 +45,41 @@ |
1293 |
+ |
1294 |
+ # List common include file locations not under the common prefixes. |
1295 |
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH |
1296 |
+- # Windows API on Cygwin |
1297 |
+- /usr/include/w32api |
1298 |
+- |
1299 |
+- # X11 |
1300 |
+- /usr/X11R6/include /usr/include/X11 |
1301 |
+- |
1302 |
+- # Other |
1303 |
+- /usr/pkg/include |
1304 |
+- /opt/csw/include /opt/include |
1305 |
+- /usr/openwin/include |
1306 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
1307 |
+ ) |
1308 |
+ |
1309 |
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH |
1310 |
+- # Windows API on Cygwin |
1311 |
+- /usr/lib/w32api |
1312 |
+- |
1313 |
+- # X11 |
1314 |
+- /usr/X11R6/lib /usr/lib/X11 |
1315 |
+- |
1316 |
+- # Other |
1317 |
+- /usr/pkg/lib |
1318 |
+- /opt/csw/lib /opt/lib |
1319 |
+- /usr/openwin/lib |
1320 |
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
1321 |
++ @GENTOO_PORTAGE_GCCLIBDIR@ |
1322 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
1323 |
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
1324 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
1325 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
1326 |
++ @GENTOO_PORTAGE_EPREFIX@lib |
1327 |
+ ) |
1328 |
+ |
1329 |
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH |
1330 |
+- /usr/pkg/bin |
1331 |
++ @GENTOO_PORTAGE_EPREFIX@usr/bin |
1332 |
++ @GENTOO_PORTAGE_EPREFIX@bin |
1333 |
+ ) |
1334 |
+ |
1335 |
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES |
1336 |
+- /lib /usr/lib /usr/lib32 /usr/lib64 |
1337 |
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
1338 |
++ @GENTOO_PORTAGE_GCCLIBDIR@ |
1339 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
1340 |
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
1341 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
1342 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
1343 |
++ @GENTOO_PORTAGE_EPREFIX@lib |
1344 |
++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 |
1345 |
+ ) |
1346 |
+ |
1347 |
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES |
1348 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
1349 |
+ /usr/include |
1350 |
+ ) |
1351 |
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES |
1352 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
1353 |
+ /usr/include |
1354 |
+ ) |
1355 |
+ |
1356 |
|
1357 |
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch |
1358 |
new file mode 100644 |
1359 |
index 0000000..a91214c |
1360 |
--- /dev/null |
1361 |
+++ b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch |
1362 |
@@ -0,0 +1,45 @@ |
1363 |
+diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake |
1364 |
+--- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100 |
1365 |
++++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.000000000 +0100 |
1366 |
+@@ -1,3 +1,9 @@ |
1367 |
++# |
1368 |
++# Version modified for Gentoo Linux |
1369 |
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels |
1370 |
++# all further checks. |
1371 |
++# |
1372 |
++ |
1373 |
+ # - Find BLAS library |
1374 |
+ # This module finds an installed fortran library that implements the BLAS |
1375 |
+ # linear-algebra interface (see http://www.netlib.org/blas/). |
1376 |
+@@ -39,6 +45,24 @@ |
1377 |
+ # (To distribute this file outside of CMake, substitute the full |
1378 |
+ # License text for the above reference.) |
1379 |
+ |
1380 |
++# |
1381 |
++# first, try PkgConfig |
1382 |
++# |
1383 |
++find_package(PkgConfig REQUIRED) |
1384 |
++pkg_check_modules(PC_BLAS blas) |
1385 |
++if(PC_BLAS_FOUND) |
1386 |
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) |
1387 |
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) |
1388 |
++ if (NOT ${PC_LIB}_LIBRARY) |
1389 |
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") |
1390 |
++ endif (NOT ${PC_LIB}_LIBRARY) |
1391 |
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) |
1392 |
++ endforeach(PC_LIB) |
1393 |
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) |
1394 |
++ mark_as_advanced(BLAS_LIBRARIES) |
1395 |
++else(PC_BLAS_FOUND) |
1396 |
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") |
1397 |
++ |
1398 |
+ include(CheckFunctionExists) |
1399 |
+ include(CheckFortranFunctionExists) |
1400 |
+ |
1401 |
+@@ -622,3 +646,6 @@ |
1402 |
+ endif(BLA_F95) |
1403 |
+ |
1404 |
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
1405 |
++ |
1406 |
++endif(PC_BLAS_FOUND) |
1407 |
++ |
1408 |
|
1409 |
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch |
1410 |
new file mode 100644 |
1411 |
index 0000000..edaa91f |
1412 |
--- /dev/null |
1413 |
+++ b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch |
1414 |
@@ -0,0 +1,73 @@ |
1415 |
+--- Modules/FindBoost.cmake |
1416 |
++++ Modules/FindBoost.cmake |
1417 |
+@@ -953,6 +953,11 @@ |
1418 |
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)") |
1419 |
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") |
1420 |
+ |
1421 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1422 |
++ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass. |
1423 |
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi) |
1424 |
++ endif() |
1425 |
++ |
1426 |
+ # |
1427 |
+ # Find RELEASE libraries |
1428 |
+ # |
1429 |
+@@ -962,6 +967,14 @@ |
1430 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
1431 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
1432 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
1433 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1434 |
++ list(APPEND _boost_RELEASE_NAMES |
1435 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
1436 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
1437 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
1438 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
1439 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) |
1440 |
++ endif() |
1441 |
+ if(_boost_STATIC_RUNTIME_WORKAROUND) |
1442 |
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") |
1443 |
+ list(APPEND _boost_RELEASE_NAMES |
1444 |
+@@ -969,6 +982,13 @@ |
1445 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
1446 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1447 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
1448 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1449 |
++ list(APPEND _boost_RELEASE_NAMES |
1450 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1451 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
1452 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1453 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
1454 |
++ endif() |
1455 |
+ endif() |
1456 |
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
1457 |
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) |
1458 |
+@@ -994,6 +1014,15 @@ |
1459 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
1460 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} |
1461 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
1462 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1463 |
++ list(APPEND _boost_DEBUG_NAMES |
1464 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
1465 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
1466 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
1467 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
1468 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED} |
1469 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) |
1470 |
++ endif() |
1471 |
+ if(_boost_STATIC_RUNTIME_WORKAROUND) |
1472 |
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") |
1473 |
+ list(APPEND _boost_DEBUG_NAMES |
1474 |
+@@ -1001,6 +1030,13 @@ |
1475 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
1476 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1477 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
1478 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
1479 |
++ list(APPEND _boost_DEBUG_NAMES |
1480 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1481 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
1482 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
1483 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
1484 |
++ endif() |
1485 |
+ endif() |
1486 |
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
1487 |
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) |
1488 |
|
1489 |
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch |
1490 |
new file mode 100644 |
1491 |
index 0000000..6808b80 |
1492 |
--- /dev/null |
1493 |
+++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch |
1494 |
@@ -0,0 +1,44 @@ |
1495 |
+diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake |
1496 |
+--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 |
1497 |
++++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 |
1498 |
+@@ -1,3 +1,9 @@ |
1499 |
++# |
1500 |
++# Version modified for Gentoo Linux |
1501 |
++# If a valid PkgConfig configuration is found, this overrides and cancels |
1502 |
++# all further checks. |
1503 |
++# |
1504 |
++ |
1505 |
+ # - Find LAPACK library |
1506 |
+ # This module finds an installed fortran library that implements the LAPACK |
1507 |
+ # linear-algebra interface (see http://www.netlib.org/lapack/). |
1508 |
+@@ -36,6 +42,24 @@ |
1509 |
+ # (To distribute this file outside of CMake, substitute the full |
1510 |
+ # License text for the above reference.) |
1511 |
+ |
1512 |
++# |
1513 |
++# first, try PkgConfig |
1514 |
++# |
1515 |
++find_package(PkgConfig REQUIRED) |
1516 |
++pkg_check_modules(PC_LAPACK lapack) |
1517 |
++if(PC_LAPACK_FOUND) |
1518 |
++ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) |
1519 |
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) |
1520 |
++ if (NOT ${PC_LIB}_LIBRARY) |
1521 |
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") |
1522 |
++ endif (NOT ${PC_LIB}_LIBRARY) |
1523 |
++ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) |
1524 |
++ endforeach(PC_LIB) |
1525 |
++ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) |
1526 |
++ mark_as_advanced(LAPACK_LIBRARIES) |
1527 |
++else(PC_LAPACK_FOUND) |
1528 |
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") |
1529 |
++ |
1530 |
+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) |
1531 |
+ |
1532 |
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) |
1533 |
+@@ -305,3 +329,5 @@ |
1534 |
+ endif(BLA_F95) |
1535 |
+ |
1536 |
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
1537 |
++ |
1538 |
++endif(PC_LAPACK_FOUND) |
1539 |
|
1540 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
1541 |
new file mode 100644 |
1542 |
index 0000000..c5e17c5 |
1543 |
--- /dev/null |
1544 |
+++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
1545 |
@@ -0,0 +1,18 @@ |
1546 |
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake |
1547 |
+index c47f583..5783d37 100644 |
1548 |
+--- a/Modules/FindPkgConfig.cmake |
1549 |
++++ b/Modules/FindPkgConfig.cmake |
1550 |
+@@ -87,7 +87,12 @@ |
1551 |
+ set(PKG_CONFIG_VERSION 1) |
1552 |
+ set(PKG_CONFIG_FOUND 0) |
1553 |
+ |
1554 |
+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
1555 |
++if(NOT PKG_CONFIG_EXECUTABLE) |
1556 |
++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) |
1557 |
++ if(NOT PKG_CONFIG_EXECUTABLE) |
1558 |
++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
1559 |
++ endif(NOT PKG_CONFIG_EXECUTABLE) |
1560 |
++endif(NOT PKG_CONFIG_EXECUTABLE) |
1561 |
+ mark_as_advanced(PKG_CONFIG_EXECUTABLE) |
1562 |
+ |
1563 |
+ if(PKG_CONFIG_EXECUTABLE) |
1564 |
|
1565 |
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim |
1566 |
new file mode 100644 |
1567 |
index 0000000..5cecd7d |
1568 |
--- /dev/null |
1569 |
+++ b/dev-util/cmake/files/cmake.vim |
1570 |
@@ -0,0 +1,3 @@ |
1571 |
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim |
1572 |
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake |
1573 |
+autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake |
1574 |
|
1575 |
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml |
1576 |
new file mode 100644 |
1577 |
index 0000000..a23f444 |
1578 |
--- /dev/null |
1579 |
+++ b/dev-util/cmake/metadata.xml |
1580 |
@@ -0,0 +1,5 @@ |
1581 |
+<?xml version="1.0" encoding="UTF-8"?> |
1582 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1583 |
+<pkgmetadata> |
1584 |
+ <herd>kde</herd> |
1585 |
+</pkgmetadata> |