Commit Graph

15373 Commits

Author SHA1 Message Date
David Cole 9692d5a2b6 Merge topic '11363'
fffe1c0 11363: FindBoost.cmake fails to find debug libraries in tagged layout install
2010-11-09 15:29:11 -05:00
David Cole 384816e4de Merge topic 'FixBisonWithLocale'
506805c Make FindBISON work properly with non-C locales (#11326)
2010-11-09 15:28:33 -05:00
David Cole 5965ff5112 Merge topic 'qt4-resources-bug5952'
de04854 Force cmake to run again when qrc dependency scanning needs to happen.
2010-11-09 15:27:55 -05:00
David Cole b5a46cab85 Merge topic 'qt4-imports-dir'
cfba5ef Fix regression in 2dae2f1 which added find of Qt imports dir.
2010-11-09 15:27:23 -05:00
David Cole 5aa72c6374 Merge topic 'qtdialog-use-bundleutilities'
249a9bb cmake-gui: use BundleUtilities in place of custom script.
2010-11-09 15:26:51 -05:00
Brad King d8e0bfa786 KWSys: Teach SystemInformation about WinXP Pro and Win7
Modify a few lines in the function QueryOSInformation.

Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e
Author: Marius Staring <m.staring@lumc.nl>
2010-11-09 10:50:03 -05:00
KWSys Robot bbb3d81d38 KWSys Nightly Date Stamp 2010-11-09 00:10:02 -05:00
KWSys Robot da778eeb4b KWSys Nightly Date Stamp 2010-11-08 00:10:02 -05:00
KWSys Robot d95017deec KWSys Nightly Date Stamp 2010-11-07 00:10:16 -04:00
KWSys Robot c5a47ad148 KWSys Nightly Date Stamp 2010-11-06 00:10:10 -04:00
KWSys Robot 947de96030 KWSys Nightly Date Stamp 2010-11-05 00:10:09 -04:00
KWSys Robot b58e44edfb KWSys Nightly Date Stamp 2010-11-04 00:10:01 -04:00
David Cole 1674961a3f Begin post-2.8.3 development 2010-11-03 16:42:13 -04:00
David Cole 63d21c1f8e CMake 2.8.3 2010-11-03 13:38:38 -04:00
David Cole 065bce44a9 Merge branch 'release' 2010-11-03 13:33:58 -04:00
KWSys Robot 5cf99388c3 KWSys Nightly Date Stamp 2010-11-03 00:11:01 -04:00
KWSys Robot aa350314db KWSys Nightly Date Stamp 2010-11-02 00:11:02 -04:00
KWSys Robot c1a064ba79 KWSys Nightly Date Stamp 2010-11-01 00:11:13 -04:00
KWSys Robot e3c46e648b KWSys Nightly Date Stamp 2010-10-31 00:11:07 -04:00
KWSys Robot 2d3952d521 KWSys Nightly Date Stamp 2010-10-30 00:11:07 -04:00
David Cole e5b50a9ada CMake 2.8.3-rc4 2010-10-29 15:21:36 -04:00
David Cole f54715170b Merge branch 'release' 2010-10-29 15:17:46 -04:00
KWSys Robot 57eea54720 KWSys Nightly Date Stamp 2010-10-29 00:11:07 -04:00
Philip Lowman fffe1c07d9 11363: FindBoost.cmake fails to find debug libraries in tagged layout install 2010-10-28 22:51:18 -04:00
David Cole 9bf662a92a Merge topic 'fix_ctest_working_dir'
3f94c7c When processing DartMeasurements use the tests working directory.
2010-10-28 15:36:17 -04:00
David Cole e561a46c1a Merge topic 'getprerequisites-endless-path-appending'
48e80eb Fixes to GetPrerequisites for cygwin
bee4802 Append the gp_tool path to the system PATH using native slashes.
8e550ba Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.
1684198 Switch to CMAKE_PATH when doing PATH comparisons on Windows.
be94c49 Fixed appending PATH to dumpbin tool from growing without bounds.
2010-10-28 14:11:07 -04:00
David Cole a3edde36ad Merge topic 'avoid-busted-java-test-on-macs'
c8f3919 Avoid problem reading jni.h on Macs.
2010-10-28 14:10:48 -04:00
David Cole 3f3f3e5f54 Merge topic 'CPackDeb-MoreControl'
a749724 CPackDeb Added several optional debian binary package fields
2010-10-28 14:10:23 -04:00
David Cole ec93cd2ead Merge topic 'fix-11173'
6e1282f ExternalProject: No svn --username if empty (#11173)
2010-10-28 14:10:01 -04:00
David Cole 5b43d8f8b1 Merge topic 'external-project-extra-gen'
beeca11 Fixed parallel build for generators with EXTRA.
2010-10-28 14:09:43 -04:00
David Cole 424ba550e5 Merge topic 'PythonLibs-2.7'
1f369a7 ENH: Added case for Python 2.7.
2010-10-28 14:09:17 -04:00
KWSys Robot 70101ee8e7 KWSys Nightly Date Stamp 2010-10-28 00:11:05 -04:00
David Partyka 48e80eb724 Fixes to GetPrerequisites for cygwin
Fix IF(WIN32) guards check for cygwin. Fix checking if the depenency is in a system location to use cygwin style paths on cygwin. Also change GetPrerequisites to switch gp_tool to tools that are very unlikely to be found, ie. dumpbin on Apple and otool on Windows/Unix.
2010-10-27 17:23:00 -04:00
KWSys Robot 01a90e9622 KWSys Nightly Date Stamp 2010-10-27 00:11:06 -04:00
David Partyka bee4802840 Append the gp_tool path to the system PATH using native slashes. 2010-10-26 11:12:12 -04:00
David Partyka 8e550ba31e Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.
It is already using CMAKE style paths.
2010-10-26 10:28:42 -04:00
David Partyka 1684198706 Switch to CMAKE_PATH when doing PATH comparisons on Windows.
Users PATH may contain elements that end with backslash. This will escape the semicolon when iterating resulting in mismatches.

Fix indentation.

Fix whitespace
2010-10-26 10:28:38 -04:00
KWSys Robot 7db02e9b3a KWSys Nightly Date Stamp 2010-10-26 00:11:04 -04:00
David Cole c8f39193e0 Avoid problem reading jni.h on Macs.
Apple released an update recently in which there
was a broken symlink for jni.h that pointed to
a non-existent file. CMake had trouble configuring
because it encountered an error trying to read
jni.h.

We avoid the problem here by introducing a variable
CTEST_RUN_Java, which defaults to OFF on Macs, that
indicates whether to even attempt finding java, reading
jni.h and adding the "Java" CMake test.

If you would like to test Java on a Mac where the
jni.h symlink is not busted, feel free to pass in
-DCTEST_RUN_Java:BOOL=ON when configuring CMake.
2010-10-25 15:03:36 -04:00
Eric NOULARD a749724029 CPackDeb Added several optional debian binary package fields
This fixes bugs #0011355  and 0008342.
The merged patch is a contribution from Michael Lasmanis and Petri Hodju
with some extra documentation added by the merger.
2010-10-25 20:40:45 +02:00
David Partyka be94c494ed Fixed appending PATH to dumpbin tool from growing without bounds.
IF(... MATCHES ...) used for comparing directories chokes especially in the case of C:\Program Files (x86)\<blah> because of regex pattern matching. Switched this to use STREQUAL in a loop instead.
2010-10-25 13:40:35 -04:00
KWSys Robot 06b5eaa3cf KWSys Nightly Date Stamp 2010-10-25 00:11:05 -04:00
KWSys Robot de81f2a4ee KWSys Nightly Date Stamp 2010-10-24 00:11:05 -04:00
KWSys Robot 185582d5fe KWSys Nightly Date Stamp 2010-10-23 00:12:04 -04:00
David Cole 6e1282f840 ExternalProject: No svn --username if empty (#11173)
Nor --password. But please do if non-empty. Thank you.
2010-10-22 16:23:27 -04:00
Marcus D. Hanwell beeca11c9b Fixed parallel build for generators with EXTRA.
Fixed parallel build for projects using generators that have the
CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman
for helping me to track this one down, I missed parallel builds.
2010-10-22 11:16:21 -04:00
KWSys Robot 91b5bc3efa KWSys Nightly Date Stamp 2010-10-22 00:10:12 -04:00
KWSys Robot e42160f3e0 KWSys Nightly Date Stamp 2010-10-21 00:11:02 -04:00
David Cole 144ee51760 CMake 2.8.3-rc3 2010-10-20 13:47:59 -04:00
David Cole aa55e3e56c Merge branch 'release' 2010-10-20 13:43:46 -04:00