112 Commits

Author SHA1 Message Date
Modestas Vainius
93e74a456e Backport a bunch of FindRuby improvements from cmake master.
It should be able to properly find ruby 1.9.1 as packaged in Debian now.
(Closes: #643949)

(patch backport_findruby_improvements.diff)
2012-03-17 00:40:43 +02:00
Modestas Vainius
f0b0b0d2f4 Backport a bunch of FindPython* related commits from cmake master.
It is now possible to force a specific python version via command line again.
The interface has changed though, see NEWS entry. (Closes: #663188)

(patch backport_findpython_fixes.diff)
2012-03-17 00:40:43 +02:00
Modestas Vainius
74bc2b76d2 Drop support_cppflags.diff patch.
This particular solution was rejected by upstream.
Reopens #653916.
2012-02-27 01:07:42 +02:00
Modestas Vainius
8c098f5507 Fix some tests not to fail if absolute build path contains regex metacharacters like +.
This makes the package binNMUable again. (patch
paths_in_regex_espace_metachars.diff)
2012-02-27 01:07:42 +02:00
Modestas Vainius
4f2ae6f526 Properly detect mipsel as little endian architecture.
Fixes FTBFS (patch mipsel_is_little_endian.diff).
2012-02-19 13:40:30 +02:00
Modestas Vainius
11cd193c55 Fix various typos and formatting errors in manpages
Patch manpage_fixes.diff.
2012-02-18 15:43:23 +02:00
Modestas Vainius
6a10d7b694 Respect CPPFLAGS environment variable.
Append it to C(XX)FLAGS when building C/C++ sources.
Patch support_cppflags.diff.
(Closes: #653916)
2012-02-18 13:49:53 +02:00
Modestas Vainius
b896b4e6b7 Remove multiarch_lib_dirs_should_be_implicit.diff patch, merged upstream. 2012-02-18 13:25:57 +02:00
Modestas Vainius
97296f5ce6 Make sure CMake considers /lib/<arch> as implicit.
Therefore CMake keeps it out of automatic R(UN)PATH then (patch
multiarch_lib_dirs_should_be_implicit.diff).
2011-07-09 15:17:25 +03:00
Modestas Vainius
3dabc0c10b Drop merged patches.
* Drop screen-256color-bce.diff - merged upstream.
* Drop spelling_formatting_fixes.diff - merged upstream.
2011-07-09 00:52:10 +03:00
Modestas Vainius
49ef65c97c Fix a couple of new spelling / formatting errors.
(patch spelling_formatting_fixes.diff)

W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2641: warning [p 39, 1.5i]: can't break line
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz explict explicit
I: cmake: spelling-error-in-binary usr/bin/cmake explict explicit
I: cmake: spelling-error-in-binary usr/bin/cpack explict explicit
I: cmake: spelling-error-in-binary usr/bin/ctest explict explicit
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 7300: warning [p 120, 3.3i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explict explicit
I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake explict explicit
I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui explict explicit
2011-06-19 17:35:09 +03:00
Modestas Vainius
05b13d548a Drop patches which are no longer needed.
* Drop fixup_manpages.diff patch, merged upstream.
* Drop backport_test_order_fix.diff patch, was backported from upstream.
* Drop multiarch_basic_support.diff patch, merged upstream.
2011-06-19 15:51:30 +03:00
Modestas Vainius
392f6fb9bc Add multiarch implementation from upstream.
Implemented in patch multiarch_basic_support.diff, taken from upstream bug
backwards compatible with previous releases and in addition, it implements
multiarch support for find_package().
2011-06-09 01:12:42 +03:00
Modestas Vainius
db159fb2cc Revert "Fix find_library() to find libraries in multiarch library paths."
This effectively reverts commit 3220ba5539ea5095540d8bbf297ee568ce3e8b40 and
adds appropriate debian/changelog modifications.
2011-06-09 00:40:55 +03:00
Modestas Vainius
d387f1b70e Make FindGTK2.cmake work with Debian multiarch.
Implemented in the patch multiarch_findgtk2_fix.diff.
(LP: #751940)
2011-06-08 00:11:29 +03:00
Modestas Vainius
3220ba5539 Fix find_library() to find libraries in multiarch library paths.
While the patch is not a good fix (hackish by nature, no cross-compilation
support etc.), it should do the job in majority of cases. Also require dpkg-dev
>= 1.16 at both build time (Build-Depends) and runtime (cmake Depends) because
the patch needs dpkg-architecture -qDEB_HOST_MULTIARCH. (Closes: #618932)

Implemented in multiarch_library_directory_hack.diff.
2011-06-08 00:08:18 +03:00
Modestas Vainius
f28541d7ef Generate colour Makefiles if $TERM is 'screen-256color-bce'.
Thanks to Davide Mancusi for the patch (screen-256color-bce.diff).
(Closes: #627853)
2011-05-30 23:44:34 +03:00
Modestas Vainius
7b26c06e09 Backport patch to fix test order (broken in 2.8.4).
Add backport_test_order_fix.diff to restore conpatibility with earlier versions
with respect to the test run order. (Closes: #615054)
2011-02-25 19:12:17 +02:00
Kai Wasserbäch
cdd8ec7b95 debian/patches/FindBoost_add_-lpthread_#563479.diff: Added. (Closes: #563479) 2011-01-16 18:33:22 +01:00
Kai Wasserbäch
c17a90bf49 Dropped obsolete patch: FindPython_fix_#569321_and_#580503.diff 2011-01-16 11:49:34 +01:00
Kai Wasserbäch
ed365f7923 Dropped obsolete patch: FindTCL_fix_#600245.diff 2011-01-16 11:44:22 +01:00
Kai Wasserbäch
192311b428 Dropped obsolete patche: backport_fix_asm_support.diff 2011-01-16 11:42:17 +01:00
Kai Wasserbäch
7bca51398e Reverting the last two commits.
This reverts commit d63a84bd7ba2495d5cf970987535e276402287ff and
65f2b045e38123599ce9637f756189d64924b550. This is in accordance with
what Brad King answered to #600889 (not a CMake bug).
2011-01-12 15:16:17 +01:00
Kai Wasserbäch
d63a84bd7b debian/patches/FindVTK_fix_#600889.diff: Added. (Closes: #600889) 2011-01-10 22:17:40 +01:00
Modestas Vainius
9643b76229 Backport a patch from 2.8.4 to fix ASM support.
Thanks to Leon Nardella for heads up. (Closes: #608510, LP: #695335)
2011-01-02 12:44:52 +02:00
Kai Wasserbäch
f56a1e051a debian/patches/FindTCL_fix_#600245.diff: Added. (Closes: #600245)
The FIND_LIBRARY() statement for TCL used the TK variables and vice versa.
This patch reverses that into the right usage.
2010-11-27 10:42:49 +01:00
Modestas Vainius
3f23321ee1 Add fixup_manpages.diff patch to fix small issues with cmake mangpages.
Found by lintian:

W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 10029: warning [p 158, 13.5i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz informations information
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz dependant dependent
2010-11-13 02:41:24 +02:00
Modestas Vainius
0ac23dc6b7 Drop patches which were merged upstream.
- debian/patches/hurd_platform.diff;
- FindGTK2_pangommconfig.diff;
- FindJNI_fix_libarch_determination.diff;
- cpack_installed_size.diff;
- add_libarchive_script.patch - better version merged upstream;
- fix-CTestTestFailedSubmit-xmlrpc.diff;
- fix_spelling_errors.patch.
2010-11-13 02:38:29 +02:00
Kai Wasserbäch
a0f2851e04 Fix spelling mistakes in CMake and its documentation.
Lintian showed a lot of spelling mistakes in the binaries and the
auto-generated documentation.

Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-07-02 17:00:00 +02:00
Modestas Vainius
4f3be47179 Build with CTEST_USE_XMLRPC to reenable XMLRPC support in CTest.
Also add fix-CTestTestFailedSubmit-xmlrpc.diff patch to fix a (wrongly) failing
test in that case.
2010-07-02 04:38:13 +03:00
Kai Wasserbäch
9a050335e1 Add Findlibarchive.cmake to allow building with system's libarchive.
Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-07-01 19:47:09 +02:00
Modestas Vainius
93078db9bb Update patches for new upstream release.
- kFreeBSD_Hurd_fixes.diff - remove, merged upstream;
2010-06-28 22:58:42 +03:00
Kai Wasserbäch
08958f98ad Expand debian/patches/FindPython_fix_#580503.diff to cover #569321 too.
Actually a very small change: just also check if there is a specific
version requested, otherwise proceed as with the previous patch.

Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-06-03 17:39:18 +02:00
Kai Wasserbäch
6ae03be2f1 debian/patches/FindPython_fix_#580503.diff: Added. (Closes: #580503)
The patch was additionally tested by Jakub Wilk.

Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-06-03 15:24:54 +02:00
Modestas Vainius
86797b8024 Add cpack_installed_size.diff to fix generation of Installed-Size field for deb packages.
Thanks to Simone Rossetto for heads up and initial patch.
2010-05-17 01:24:15 +03:00
Modestas Vainius
f87fbec650 Rename (to kFreeBSD_Hurd_fixes.diff) and improve kFreeBSD_fixes.diff to fix FTBFS on GNU/Hurd as well. 2010-05-05 11:49:19 +03:00
Modestas Vainius
5dc3acd737 Add FindGTK2_pangommconfig.diff patch.
Look for Pangomm Config include directory in FindGTK2.cmake (Closes: #579718).
Thanks to Sune Vuorela for the patch.
2010-05-05 11:30:23 +03:00
Modestas Vainius
e9e236776c Rewrite _java_libarch determination code in FindJNI.cmake (based on new code in OpenJDK 1.6.0_18).
This should fix invalid _java_libarch detection on mipsel and armel (patch
FindJNI_fix_libarch_determination.diff).
2010-05-01 23:06:26 +03:00
Modestas Vainius
9a1918d166 Add kFreeBSD_fixes.diff patch to fix FTBFS on kfreebsd-*
Fixes failure of the CTestTestTimeout test. kFreeBSD has the same userland as
Linux. This change is necessary to enable kwsysProcessKill() to kill child
processes on kFreeBSD. The bug was detected by CTestTestTimeout test.
2010-03-18 01:44:56 +02:00
Modestas Vainius
27b3dd912d Update debian/patches.
- drop bootstraptest_increase_timeout.diff - merged upstream;
- hurd_platform.diff - adapt to upstream changes.
2010-03-17 14:16:01 +02:00
Modestas Vainius
46e2dd5af8 Fix GNU.cmake file used on Hurd.
Thanks to Pino Toscano for the patch.
2009-11-22 20:32:57 +02:00
Modestas Vainius
0e1661310d Increase timeout of BootstrapTest to 2 hours.
So it no longer times out on s390 or armel
(patch bootstraptest_increase_timeout.diff).
2009-11-22 20:32:50 +02:00
Modestas Vainius
6f4e84221b Build with CMAKE_USE_RELATIVE_PATHS=ON. 2009-11-06 23:08:55 +02:00
Modestas Vainius
d8fcc4f4dc Update to new upstream release, drop all patches. 2009-10-11 11:03:05 +03:00
Modestas Vainius
579dddb1fe Fixes a couple issues with scripts from Modules/ and Templates/
The first hunk fixes permissions of Modules/SquishRunTestCase.sh script.
INSTALL() used to remove executable permissions. The second hunk adds #!/bin/sh
to the top of the script Templates/cygwin-package.sh.in. All executable
interpreted scripts should have this directive.
2009-10-05 00:08:25 +03:00
Modestas Vainius
92f9902681 Remove deprecated Enconding field from CMake.desktop.
Patch desktop-remove-deprecated.diff.
2009-10-04 23:38:38 +03:00
Modestas Vainius
4f28604338 Readd manpage_friendly_docs.diff with new fixes.
New manpage formatting problems appeared in CMake 2.8-rc2.
2009-10-04 23:24:56 +03:00
Modestas Vainius
b152287dce Update patches.
- FindQt4.cmake2.6.diff - remove, no longer needed as original bug has been
  fixed since 2.6;
- FindQt3.cmake.diff - refresh, add DEP-3 headers;
- findmpeg2-addpath.diff - remove, bug fixed upstream (in other way);
- kfreebsd-Platform.diff - refresh, add DEP-3 headers;
- executables-dont-need-fpic.diff - refresh, app DEP-3 headers;
- manpage_friendly_docs.diff - remove, merged upstream;
- FindPerlLibs.cmake-perl-5.10.diff - remove, fixed upstream differently;
- FindJNI.cmake-more-arches.diff - remove, was taken from upstream;
- FindVTK.cmake-vtk-5.4.diff - remove, was taken from upstream.
2009-10-04 14:38:08 +03:00
Modestas Vainius
28b71b44ee FindVTK.cmake: support VTK 5.4.
Backport Modules/FindVTK.cmake from CMake 2.8 CVS. It adds support
for VTK 5.4. Patch FindVTK.cmake-vtk-5.4.diff (Closes: #546030).
2009-09-30 19:17:43 +03:00
Modestas Vainius
92419bfe3b FindJNI.cmake: find java library directory on all linux arches.
Patch FindJNI.cmake-more-arches.diff. Previously architecture set were limited
to i386, amd64 and (incorrectly) ppc. The new code is based on OpenJDK
jdk/make/common/shared/Platform.gmk and has been translated to cmake. This
patch almost closes: #544674.
2009-09-30 18:59:26 +03:00