summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCTestMultiProcessHandler: Refactor RUN_SERIAL implementationZack Galbreath2015-06-302-4/+32
| | | | | | | | The original implementation of the RUN_SERIAL test property worked by having such a test consume all available processors. Instead use an explicit flag to indicate that a serial test is running. This avoids artificially inflating the number of processors a test is expected to consume.
* cmSystemTools: Add StringToULong helperBrad King2015-06-302-0/+10
| | | | Convert a string to an unsigned integer and reject any extra input.
* Tests: Teach RunCMake infrastructure to optionally timeoutBrad King2015-06-301-0/+7
| | | | | Add a RunCMake_TEST_TIMEOUT option that tests can set to cause RunCMake to limit the time it waits for the child process to finish.
* Help: Fix typo in ctest_test documentationZack Galbreath2015-06-241-1/+1
| | | | s/acorss/across/
* Merge branch 'release'Brad King2015-06-230-0/+0
|\
| * Merge branch 'fix-function-missing-end' into releaseBrad King2015-06-2213-27/+52
| |\
| * \ Merge branch 'doc-cmake-buildsystem-typo' into releaseBrad King2015-06-221-1/+1
| |\ \
* | \ \ Merge branch 'release-3.2'Brad King2015-06-230-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'fix-function-missing-end' into release-3.2Brad King2015-06-2213-27/+52
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge topic 'use-generator-target'Brad King2015-06-2322-57/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7714235 Get the local generator from the GeneratorTarget. 5aa556be cmMakefileTargetGenerator: Require cmGeneratorTarget. bb88668a cmNinjaGenerator: Require cmGeneratorTarget. a3b210fd cmGeneratorTarget: Require a cmLocalGenerator to construct. 8ec60c67 cmGlobalGenerator: Create GeneratorTargets with a local generator. dee197fe GHS: Use a cmGeneratorTarget in generator API. b2b41b83 cmGeneratorTarget: Add accessor for cmLocalGenerator. 2e9333a1 C::B: Get the Makefile from the LocalGenerator, not vice-versa.
| * | | | | Get the local generator from the GeneratorTarget.Stephen Kelly2015-06-224-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | The Makefile should not know the LocalGenerator at all
| * | | | | cmMakefileTargetGenerator: Require cmGeneratorTarget.Stephen Kelly2015-06-225-9/+8
| | | | | |
| * | | | | cmNinjaGenerator: Require cmGeneratorTarget.Stephen Kelly2015-06-224-9/+8
| | | | | |
| * | | | | cmGeneratorTarget: Require a cmLocalGenerator to construct.Stephen Kelly2015-06-223-5/+6
| | | | | |
| * | | | | cmGlobalGenerator: Create GeneratorTargets with a local generator.Stephen Kelly2015-06-223-4/+5
| | | | | |
| * | | | | GHS: Use a cmGeneratorTarget in generator API.Stephen Kelly2015-06-223-11/+12
| | | | | |
| * | | | | cmGeneratorTarget: Add accessor for cmLocalGenerator.Stephen Kelly2015-06-222-0/+7
| | | | | |
| * | | | | C::B: Get the Makefile from the LocalGenerator, not vice-versa.Stephen Kelly2015-06-222-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Makefile is a configure-time concept, and the LocalGenerator is a generate time concept. The LocalGenerator should not be available from the Makefile.
* | | | | | Merge topic 'fix-function-missing-end'Brad King2015-06-2313-27/+52
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | 5d85fb4f Fix assertion failure on unmatched function or macro
| * | | | | Fix assertion failure on unmatched function or macroBrad King2015-06-2213-27/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach in function, 2015-05-18) broke handling of unmatched non-loop blocks because it assumed all function blockers removed during error unwinding were for loops, essentially switching the set of mishandled cases. The purpose of the loop block push/pop operations is to define a scope matching the lifetime of the loop function blockers. Since our function blockers already have the proper lifetime, simply move the push/pop operations to their constructor/destructor. Extend the RunCMake.Syntax test with a case covering this.
* | | | | | Merge topic 'qt-autogen-always-run'Brad King2015-06-238-21/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bf22a4b QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD 0e346427 QtAutogen: Always run autogen step even when rcc is enabled (#15608)
| * | | | | | QtAutogen: Add comment explaining why rcc cannot use PRE_BUILDBrad King2015-06-231-0/+3
| | | | | | |
| * | | | | | QtAutogen: Always run autogen step even when rcc is enabled (#15608)Brad King2015-06-198-21/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input changes, 2014-09-17) the "cmake -E cmake_autogen" rule was switched from always running to running as a custom command with dependencies if rcc is enabled. This is not correct because automoc always needs to re-run. Switch back to always running the command.
* | | | | | | CMake Nightly Date StampKitware Robot2015-06-231-1/+1
| | | | | | |
* | | | | | | Merge topic 'minor-cleanups'Brad King2015-06-2215-58/+81
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 820986ed cmLocalGenerator: Constify GetIncludeDirectories method. b3e2e332 QtAutogen: Get the global generator from the Makefile. 61c0113c cmLocalUnixMakefileGenerator3: Remove unused method. 080489b8 cmMakefile: Use member directly instead of through method. 8bfaadfa cmMakefile: Move IsRoot API from cmLocalGenerator. 217c243d cmake: Update the current snapshot when Resetting. eb05dcd6 cmLocalGenerator: Add IssueMessage method. cfae7fa4 cmMakefile: Use cmOutputConverter instead of cmLocalGenerator. ccf7760f cmOutputConverter: Constify API.
| * | | | | | cmLocalGenerator: Constify GetIncludeDirectories method.Stephen Kelly2015-06-212-2/+2
| | | | | | |
| * | | | | | QtAutogen: Get the global generator from the Makefile.Stephen Kelly2015-06-211-2/+1
| | | | | | |
| * | | | | | cmLocalUnixMakefileGenerator3: Remove unused method.Stephen Kelly2015-06-211-3/+0
| | | | | | |
| * | | | | | cmMakefile: Use member directly instead of through method.Stephen Kelly2015-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This function will not be around much longer anyway.
| * | | | | | cmMakefile: Move IsRoot API from cmLocalGenerator.Stephen Kelly2015-06-217-13/+13
| | | | | | |
| * | | | | | cmake: Update the current snapshot when Resetting.Stephen Kelly2015-06-213-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will matter when definitions are stored in the cmState.
| * | | | | | cmLocalGenerator: Add IssueMessage method.Stephen Kelly2015-06-213-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For use at generate-time instead of the cmMakefile method of the same name.
| * | | | | | cmMakefile: Use cmOutputConverter instead of cmLocalGenerator.Stephen Kelly2015-06-211-6/+7
| | | | | | |
| * | | | | | cmOutputConverter: Constify API.Stephen Kelly2015-06-214-22/+24
| | | | | | |
* | | | | | | Merge topic 'clean-up-ReadListFile'Brad King2015-06-222-74/+81
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81eb2c58 cmMakefile: Simplify filename handling. 5c837686 cmMakefile: Make the IncludeScope more responsible. c10ab014 cmMakefile: Move IncludeScope. 3404f8a0 cmMakefile: Move ListFile parsing responsibility out of internal method. a1858136 cmMakefile: Rename parameter. ad47e6e5 cmMakefile: Inline ReadListFileInternal into caller. 254be613 cmMakefile: Move resource management into the IncludeScope. 826b6e68 cmMakefile: Move IncludeScope to ReadDependentFile. e53072d6 cmMakefile: Move IncludeScope instance. b7166afa cmMakefile: Remove File from IncludeScope. 27f229b9 cmMakefile: Move include scope out of ReadListFileInternal. 9166b49d cmMakefile: Change order of raii scopes. 384a0dba cmMakefile: Simplify condition handling. 5e24ff17 cmMakefile: Split file handling from execution. d5aaa2b9 cmMakefile: Move check for unused variables. fff3c6cd cmMakefile: Move a container population. ...
| * | | | | | | cmMakefile: Simplify filename handling.Stephen Kelly2015-06-211-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method has only one caller.
| * | | | | | | cmMakefile: Make the IncludeScope more responsible.Stephen Kelly2015-06-211-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now responsible for all resource management when including a file.
| * | | | | | | cmMakefile: Move IncludeScope.Stephen Kelly2015-06-211-1/+2
| | | | | | | |
| * | | | | | | cmMakefile: Move ListFile parsing responsibility out of internal method.Stephen Kelly2015-06-212-21/+41
| | | | | | | |
| * | | | | | | cmMakefile: Rename parameter.Stephen Kelly2015-06-212-13/+13
| | | | | | | |
| * | | | | | | cmMakefile: Inline ReadListFileInternal into caller.Stephen Kelly2015-06-212-18/+11
| | | | | | | |
| * | | | | | | cmMakefile: Move resource management into the IncludeScope.Stephen Kelly2015-06-211-5/+2
| | | | | | | |
| * | | | | | | cmMakefile: Move IncludeScope to ReadDependentFile.Stephen Kelly2015-06-212-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add replacement simple push/pop in the other two callers of ReadListFile.
| * | | | | | | cmMakefile: Move IncludeScope instance.Stephen Kelly2015-06-211-1/+2
| | | | | | | |
| * | | | | | | cmMakefile: Remove File from IncludeScope.Stephen Kelly2015-06-211-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get it from the Makefile instead.
| * | | | | | | cmMakefile: Move include scope out of ReadListFileInternal.Stephen Kelly2015-06-212-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the ReadListFileInternal API.
| * | | | | | | cmMakefile: Change order of raii scopes.Stephen Kelly2015-06-211-1/+1
| | | | | | | |
| * | | | | | | cmMakefile: Simplify condition handling.Stephen Kelly2015-06-211-13/+9
| | | | | | | |
| * | | | | | | cmMakefile: Split file handling from execution.Stephen Kelly2015-06-211-8/+11
| | | | | | | |
| * | | | | | | cmMakefile: Move check for unused variables.Stephen Kelly2015-06-211-5/+2
| | | | | | | |