Commit Graph

15387 Commits

Author SHA1 Message Date
David Cole
c8f6c33ec8 Merge topic 'external-link-depends'
95f149e Define LINK_DEPENDS target property (#11406)
07cfa57 Consolidate duplicate link rule make dependency code
2010-11-09 15:40:37 -05:00
David Cole
e3b1dc171d Merge topic 'document-custom-command-no-DEPENDS'
80edcc6 Document custom command behavior without DEPENDS (#11407)
2010-11-09 15:39:43 -05:00
David Cole
01decafc97 Merge topic 'improve-HTML-test'
5d3cfdc No CMake.HTML test if xmllint has no --nonet.
bb1df1e Make HTML test fail when --nonet arg is not available.
2010-11-09 15:39:09 -05:00
David Cole
b5f9be1d03 Merge topic 'CheckCompilerFlag-foreign-MSVC'
79e0233 BUG: Fix compiler flag test for non-English MSVC (#11336)
2010-11-09 15:37:33 -05:00
David Cole
8eaf172279 Merge topic 'rule-messages'
dc36b34 Honor RULE_MESSAGES property for build target messages
2010-11-09 15:36:08 -05:00
David Cole
1774622487 Merge topic 'cmake-gui-args-11388'
0476715 Fix regression to allow specifying a CMakeCache.txt file on the command line.
2010-11-09 15:32:43 -05:00
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
Brad King
95f149e61f Define LINK_DEPENDS target property (#11406)
Custom Makefile link rules may need to depend on linker scripts.  Define
this property to allow user-specified link-time dependencies.
2010-11-05 09:05:08 -04:00
Brad King
07cfa57ec5 Consolidate duplicate link rule make dependency code
Factor code previously duplicated for library and executable rules into
a common method.
2010-11-05 08:33:47 -04:00
Brad King
80edcc6a86 Document custom command behavior without DEPENDS (#11407)
The behavior of add_custom_command when no DEPENDS option is specified
matches that of standard Make behavior, but it does not hurt to describe
it explicitly.
2010-11-05 08:08:37 -04:00
KWSys Robot
947de96030 KWSys Nightly Date Stamp 2010-11-05 00:10:09 -04:00
David Cole
5d3cfdc1f8 No CMake.HTML test if xmllint has no --nonet.
In commit bb1df1ec, we temporarily ran an alternate test,
guaranteed to fail when the --help output of xmllint did
not contain --nonet and --path.

This commit simply eliminates the test altogether in
this condition rather than make an attempt (doomed to
fail) to pull down the dtd over the internet.

On date=2010-11-04, the CMake dashboard results showed that
the test failed on the following CMake dashboard machines:

  dash8.kitware
  dash8.kitwarein.com
  dashsun1
  dashsun1.kitware
  ferrari

This is a very small subset of the dashboard machines, and
we have enough proof from enough other machines that the test
passes with xmllint versions new enough to have the --nonet
support.

Therefore, eliminate the CMake.HTML test on machines with old
versions of xmllint. To run the test, make sure you run it
on a machine with a new enough xmllint.
2010-11-04 10:07:11 -04:00
Brad King
79e02333a6 BUG: Fix compiler flag test for non-English MSVC (#11336)
Approach suggested by John Stark.
2010-11-04 08:50:17 -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
Campbell Barton
dc36b34994 Honor RULE_MESSAGES property for build target messages 2010-11-03 10:10:03 -04:00
KWSys Robot
5cf99388c3 KWSys Nightly Date Stamp 2010-11-03 00:11:01 -04:00
David Cole
bb1df1ec8e Make HTML test fail when --nonet arg is not available.
Also, emit "xmllint" and "xmllint --version" output before
failing so that we can inspect the output from all the
dashboard machines in CDash test results.
2010-11-02 10:41:11 -04:00
KWSys Robot
aa350314db KWSys Nightly Date Stamp 2010-11-02 00:11:02 -04:00
Clinton Stimpson
0476715b87 Fix regression to allow specifying a CMakeCache.txt file on the command line. 2010-11-01 09:40:25 -06: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