summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing whitespaceAlex Neundorf2010-11-118-208/+208
| | | | Alex
* Merge topic '11429_FindGTK2_MSVC10'David Cole2010-11-111-4/+9
|\ | | | | | | | | 1321eb9 11429: FindGTK2 does not find libraries built for Visual Studio 2010
| * 11429: FindGTK2 does not find libraries built for Visual Studio 2010Philip Lowman2010-11-101-4/+9
| | | | | | | | | | Adds support for detecting builds of FindGTK2 with Visual Studio 2010. Thanks to Vincent Levesque for the patch.
* | KWSys Nightly Date StampKWSys Robot2010-11-111-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2010-11-101-1/+1
|/
* Merge topic 'fix_osf_build'David Cole2010-11-095-7/+20
|\ | | | | | | | | | | 92c082b Add a fix for the inline keyword on the osf os. bd56626 Fixes for the OSF operating system build.
| * Add a fix for the inline keyword on the osf os.Bill Hoffman2010-09-101-1/+1
| |
| * Fixes for the OSF operating system build.Bill Hoffman2010-09-084-6/+19
| |
* | Merge topic 'add-cse-contract-test'David Cole2010-11-096-2/+256
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | f6f3ae5 Update tag in the Contracts/cse-snapshot test. 1e4fd5f Enable overriding contract test timeout values. c81ad34 Add a contract test for building the CSE. 942ace8 Fix contract test so it is not hard coded to the vtk542 test. fd343a1 Add a "Contract" test for VTK. The test downloads and builds VTK.
| * | Update tag in the Contracts/cse-snapshot test.David Cole2010-10-281-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also: - allow local variables 'repo' and 'tag' to be overridden by the optional LocalOverrides.cmake - print out STATUS messages to see the variable values in CMake configure output
| * | Enable overriding contract test timeout values.David Cole2010-10-221-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a longer value as the default timeout (6 hours). For a per-contract-test timeout value, set ${project}_TEST_TIMEOUT in the project's RunTest.cmake file. To use a longer value for all non-specific contract tests, set a CMake cache variable named CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT. All timeout values are in seconds. Also, patch up last commit to defer evaluation of ENV{HOME} until EnforceConfig.cmake is included at ctest time. This allows Windows machines to have "\\" characters in the HOME environment variable if they want to.
| * | Add a contract test for building the CSE.David Cole2010-10-084-1/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To activate the CSE contract test on a given Linux machine's CMake dashboard, put CMAKE_CONTRACT_PROJECTS:STRING=cse-snapshot in the CMake dashboard's initial cache. The chosen snapshot does not generate subproject dependency info right now. That code was in a previous revision in the CSE's svn repo that apparently has not been merged into the present cse git repository master branch. After that is fixed up in the cse repo, we can update the tag here so that the snapshot built here can run a sub-project based dashboard script. For now, it runs as one big build step, building 'all'.
| * | Fix contract test so it is not hard coded to the vtk542 test.Bill Hoffman2010-09-212-1/+10
| | |
| * | Add a "Contract" test for VTK. The test downloads and builds VTK.Bill Hoffman2010-09-212-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | The idea is that we can make sure that CMake is staying backwards compatible by testing projects against CMake as the changes are made in CMake. Because these tests will take a long time to run, they will not be enabled by default. Instead, they will be enabled by putting a cache variable into CMake.
* | | Merge topic 'FindPerlLibs-mac'David Cole2010-11-091-0/+28
|\ \ \ | | | | | | | | | | | | | | | | 20ceccc FindPerlLibs: Fix for Mac locally applied patches
| * | | FindPerlLibs: Fix for Mac locally applied patchesDave Abrahams2010-11-081-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously FindPerlLibs did not work with the Mac stock Perl because it includes patches. From "perl -V": Locally applied patches: /Library/Perl/Updates/<version> comes before system perl directories installprivlib and installarchlib points to the Updates directory Adjust paths accordingly.
* | | | Merge topic 'external-link-depends'David Cole2010-11-098-50/+87
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 95f149e Define LINK_DEPENDS target property (#11406) 07cfa57 Consolidate duplicate link rule make dependency code
| * | | | Define LINK_DEPENDS target property (#11406)Brad King2010-11-055-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | Custom Makefile link rules may need to depend on linker scripts. Define this property to allow user-specified link-time dependencies.
| * | | | Consolidate duplicate link rule make dependency codeBrad King2010-11-054-50/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Factor code previously duplicated for library and executable rules into a common method.
* | | | | Merge topic 'document-custom-command-no-DEPENDS'David Cole2010-11-091-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 80edcc6 Document custom command behavior without DEPENDS (#11407)
| * | | | | Document custom command behavior without DEPENDS (#11407)Brad King2010-11-051-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'improve-HTML-test'David Cole2010-11-091-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d3cfdc No CMake.HTML test if xmllint has no --nonet. bb1df1e Make HTML test fail when --nonet arg is not available.
| * | | | | No CMake.HTML test if xmllint has no --nonet.David Cole2010-11-041-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Make HTML test fail when --nonet arg is not available.David Cole2010-11-021-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'CheckCompilerFlag-foreign-MSVC'David Cole2010-11-092-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79e0233 BUG: Fix compiler flag test for non-English MSVC (#11336)
| * | | | | | BUG: Fix compiler flag test for non-English MSVC (#11336)Brad King2010-11-042-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Approach suggested by John Stark.
* | | | | | | Merge topic 'rule-messages'David Cole2010-11-092-77/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc36b34 Honor RULE_MESSAGES property for build target messages
| * | | | | | | Honor RULE_MESSAGES property for build target messagesCampbell Barton2010-11-032-77/+96
| | | | | | | |
* | | | | | | | Merge topic 'cmake-gui-args-11388'David Cole2010-11-091-1/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0476715 Fix regression to allow specifying a CMakeCache.txt file on the command line.
| * | | | | | | | Fix regression to allow specifying a CMakeCache.txt file on the command line.Clinton Stimpson2010-11-011-1/+13
| | | | | | | | |
* | | | | | | | | Merge topic '11363'David Cole2010-11-091-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fffe1c0 11363: FindBoost.cmake fails to find debug libraries in tagged layout install
| * | | | | | | | | 11363: FindBoost.cmake fails to find debug libraries in tagged layout installPhilip Lowman2010-10-291-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'FixBisonWithLocale'David Cole2010-11-091-4/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 506805c Make FindBISON work properly with non-C locales (#11326)
| * | | | | | | | | | Make FindBISON work properly with non-C locales (#11326)Alex Neundorf2010-10-181-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying the patch attached to http://public.kitware.com/Bug/view.php?id=11326 It sets LC_ALL to C before calling execute_process(), so the output is in english. Alex
* | | | | | | | | | | Merge topic 'qt4-resources-bug5952'David Cole2010-11-091-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de04854 Force cmake to run again when qrc dependency scanning needs to happen.
| * | | | | | | | | | | Force cmake to run again when qrc dependency scanning needs to happen.Clinton Stimpson2010-10-151-1/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'qt4-imports-dir'David Cole2010-11-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfba5ef Fix regression in 2dae2f1 which added find of Qt imports dir.
| * | | | | | | | | | | Fix regression in 2dae2f1 which added find of Qt imports dir.Clinton Stimpson2010-10-151-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'qtdialog-use-bundleutilities'David Cole2010-11-092-363/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 249a9bb cmake-gui: use BundleUtilities in place of custom script.
| * | | | | | | | | | | | cmake-gui: use BundleUtilities in place of custom script.Clinton Stimpson2010-10-142-363/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BundleUtilities is better supported and allows including shared Qt libs on other platforms. Also removed limitation of static Qt for windows build of cmake-gui.
* | | | | | | | | | | | | KWSys: Teach SystemInformation about WinXP Pro and Win7Brad King2010-11-091-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify a few lines in the function QueryOSInformation. Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e Author: Marius Staring <m.staring@lumc.nl>
* | | | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-091-1/+1
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-081-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-071-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-061-1/+1
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-051-1/+1
| | | | | | | | | | |
* | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-041-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Begin post-2.8.3 developmentDavid Cole2010-11-031-2/+2
| | | | | | | | | |
* | | | | | | | | | CMake 2.8.3v2.8.3David Cole2010-11-032-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release'David Cole2010-11-032-3/+411
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |