summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| * | | | cmMakefile: Move a container population.Stephen Kelly2015-06-211-5/+3
| | | | |
| * | | | cmMakefile: Rename variables.Stephen Kelly2015-06-212-8/+8
| | | | |
| * | | | cmMakefile: Change return type of ReadListFileInternal.Stephen Kelly2015-06-212-4/+2
| | | | |
| * | | | cmMakefile: Move listfile parsing responsibility.Stephen Kelly2015-06-212-13/+14
| |/ / /
* | | | Merge topic 'clean-up-cmListFileArgument'Brad King2015-06-228-49/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 782657db cmListFileArgument: Remove FilePath member. a863c59f cmMakefile: Use GetExecutionFileStack method. 076760a6 cmMakefile: Add filename context to ExpandArguments. 569f4785 cmFunctionCommand: Store the FilePath when creating the prototype. f971ab04 cmMacroCommand: Store the FilePath when creating the prototype.
| * | | | cmListFileArgument: Remove FilePath member.Stephen Kelly2015-06-216-34/+14
| | | | | | | | | | | | | | | | | | | | It is now unused.
| * | | | cmMakefile: Use GetExecutionFileStack method.Stephen Kelly2015-06-211-1/+1
| | | | |
| * | | | cmMakefile: Add filename context to ExpandArguments.Stephen Kelly2015-06-214-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmListFileArgument currently stores a FilePath for use in this method. The filename is the same as the CMAKE_CURRENT_LIST_FILE, except if executing a macro or function defined in another file. Set the context filename when expanding the arguments of macros and functions using the filename recorded when defining the prototype.
| * | | | cmFunctionCommand: Store the FilePath when creating the prototype.Stephen Kelly2015-06-211-0/+3
| | | | |
| * | | | cmMacroCommand: Store the FilePath when creating the prototype.Stephen Kelly2015-06-211-4/+1
| |/ / / | | | | | | | | | | | | Instead of setting it each time the macro is invoked.
* | | | Merge topic 'fix-Qt5Autogen-test'Brad King2015-06-221-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6af9fa12 Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
| * | | | Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).Stephen Kelly2015-06-211-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Since Qt 5.4.2, it is necessary to compile against Qt 5 with -fPIC and not -fPIE when using GCC 5. Not doing so results in a hanging test in this case, so use the PIC flag directly instead.
* | | | Merge topic 'doc-cmake-buildsystem-typo'Brad King2015-06-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 17c51521 Help: Fix a typo in cmake-buildsystem(7) manual
| * | | | Help: Fix a typo in cmake-buildsystem(7) manualErik Sjölund2015-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Add the property name INTERFACE_INCLUDE_DIRECTORIES that was missing from a set_property command.
* | | | | CMake Nightly Date StampKitware Robot2015-06-221-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2015-06-211-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-06-201-1/+1
| |/ / |/| |
* | | Merge branch 'release'Brad King2015-06-190-0/+0
|\ \ \