summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-function-missing-end'Brad King2015-06-231-1/+0
|\ | | | | | | | | 5d85fb4f Fix assertion failure on unmatched function or macro
| * Fix assertion failure on unmatched function or macroBrad King2015-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'minor-cleanups'Brad King2015-06-221-7/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | 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-211-0/+5
| | |
| * | cmMakefile: Use cmOutputConverter instead of cmLocalGenerator.Stephen Kelly2015-06-211-6/+7
| | |
* | | Merge topic 'clean-up-ReadListFile'Brad King2015-06-221-64/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-19/+39
| | | |
| * | | cmMakefile: Rename parameter.Stephen Kelly2015-06-211-9/+9
| | | |
| * | | cmMakefile: Inline ReadListFileInternal into caller.Stephen Kelly2015-06-211-16/+11
| | | |
| * | | cmMakefile: Move resource management into the IncludeScope.Stephen Kelly2015-06-211-5/+2
| | | |
| * | | cmMakefile: Move IncludeScope to ReadDependentFile.Stephen Kelly2015-06-211-10/+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-211-6/+7
| | | | | | | | | | | | | | | | 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-211-7/+7
| | | |
| * | | cmMakefile: Change return type of ReadListFileInternal.Stephen Kelly2015-06-211-3/+1
| | | |
| * | | cmMakefile: Move listfile parsing responsibility.Stephen Kelly2015-06-211-10/+11
| |/ /
* | | cmMakefile: Use GetExecutionFileStack method.Stephen Kelly2015-06-211-1/+1
| | |
* | | cmMakefile: Add filename context to ExpandArguments.Stephen Kelly2015-06-211-6/+23
|/ / | | | | | | | | | | | | | | | | 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.
* | cmMakefile: Move CMP0059 handling to command code.Stephen Kelly2015-06-081-16/+5
| | | | | | | | | | | | | | | | Don't pay a penalty for it in all GetProperty calls. Additionally, the storage of properties will eventually move to cmState, which should only contain state and not logic for policies like this.
* | Merge topic 'data-layout'Brad King2015-06-081-11/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8174e5cd cmCustomCommand: Remove special member functions. 34e1d6db cmCustomCommand: Re-arrange data layout. 54cb76f2 cmComputeLinkDepends: Re-arrange data layout. b661d6c6 cmQtAutoGenerators: Re-arrange data layout. 40844a14 cmProcessTools: Re-arrange data layout. b1ff32af cmOrderDirectories: Re-arrange data layout. dd0417c7 cmInstallTargetGenerator: Re-arrange data layout. 125c4866 cmInstallFilesGenerator: Re-arrange data layout. 92b8b1fc cmGraphVizWriter: Re-arrange data layout. 7f3e1623 cmGlobalGenerator: Re-arrange data layout. d9df7fa7 cmComputeComponentGraph: Re-arrange data layout. db24e41b cmCommandArgumentParserHelper: Re-arrange data. 4cd13e80 cmComputeLinkInformation: Re-arrange data layout. 3e087a40 cmLocalUnixMakefileGenerator: Re-arrange data layout. e0421701 cmMakefile: Re-arrange data layout. c26696eb cmSourceFile: Re-arrange data. ...
| * | cmPropertyMap: Remove chaining logic.Stephen Kelly2015-06-071-9/+7
| | | | | | | | | | | | | | | | | | | | | The chaining logic doesn't belong to the container, and the CMakeInstance pointer doesn't need to be in cmPropertyMap. Size goes from 56 to 48 bytes with GNU libstdc++-5.1.
| * | cmPropertyMap: Remove scope parameter from API where not used.Stephen Kelly2015-06-071-2/+2
| | |
* | | Merge topic 'clean-up-cmMakefile'Brad King2015-06-081-21/+100
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c192fb5 cmMakefile: Remove cacheOnly option from GetDefinitions. 046aafff cmGetCMakePropertyCommand: Don't explicitly specify default param. 021c4b6f cmMakefile: Simplify handling of CACHE_VARIABLES property. 1981c971 cmMakefile: Simplify InitializeFromParent method. 353e422b cmMakefile: Remove unused GetPolicies method. 00bfa047 cmMakefile: Out-of-line the cmMakefileCall. db74ce58 cmMakefile: Inline PushScope into PushFunctionScope. ca140c2e cmMakefile: Create a unified raii for macro scopes. d5dc4169 cmMakefile: Create a unified raii for function scopes.
| * | | cmMakefile: Remove cacheOnly option from GetDefinitions.Stephen Kelly2015-06-071-10/+3
| | | | | | | | | | | | | | | | It is now unused.
| * | | cmMakefile: Simplify handling of CACHE_VARIABLES property.Stephen Kelly2015-06-071-7/+7
| |/ /
| * | cmMakefile: Simplify InitializeFromParent method.Stephen Kelly2015-06-061-4/+2
| | | | | | | | | | | | | | | Provide a parent instead of requiring it to be computed through the cmLocalGenerator.
| * | cmMakefile: Out-of-line the cmMakefileCall.Stephen Kelly2015-06-061-0/+12
| | |
| * | cmMakefile: Inline PushScope into PushFunctionScope.Stephen Kelly2015-06-061-2/+16
| | | | | | | | | | | | Make it possible to group the various methods here a different way.
| * | cmMakefile: Create a unified raii for macro scopes.Stephen Kelly2015-06-041-0/+29
| | |
| * | cmMakefile: Create a unified raii for function scopes.Stephen Kelly2015-06-041-0/+33
| | |
* | | Merge topic 'move-Feature-API'Brad King2015-06-081-27/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | f573bd22 cmLocalGenerator: Add Feature API from cmMakefile. ccbc2259 cmGeneratorTarget: Move Feature API from cmTarget.
| * | | cmLocalGenerator: Add Feature API from cmMakefile.Stephen Kelly2015-06-061-27/+0
| |/ /
* | | cmListFileBacktrace: Replace local generator with cmState::Snapshot.Stephen Kelly2015-06-061-2/+2
| | | | | | | | | | | | Construct cmOutputConverter only when needed.
* | | cmMakefile: Make the cmState::Snapshot accessible.Stephen Kelly2015-06-061-0/+5
|/ /
* | Merge topic 'cmMakefile-Configure'Brad King2015-06-041-10/+75
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7657e8b1 cmMakefile: Introduce a local cmMakefile variable. 4e8f242d cmMakefile: Store unconfigured cmMakefiles. d65e0123 cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile. f059ed16 cmMakefile: Move Configure responsibility from cmLocalGenerator. a653611d cmake: Replace CurrentLocalGenerator concept with CurrentMakefile. 69a038a9 cmMakefile: Refactor directories specified with the subdirs command. 08637970 cmLocalGenerator: ComputeObjectMaxPath just before generating. 27e11c6f Merge Configure state with GeneratingBuildSystem state. 363caa2f cmLocalGenerator: De-virtualize Configure().
| * | cmMakefile: Introduce a local cmMakefile variable.Stephen Kelly2015-06-041-5/+7
| | |
| * | cmMakefile: Store unconfigured cmMakefiles.Stephen Kelly2015-06-041-4/+4
| | | | | | | | | | | | Not cmLocalGenerators.
| * | cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile.Stephen Kelly2015-06-041-7/+7
| | |
| * | cmMakefile: Move Configure responsibility from cmLocalGenerator.Stephen Kelly2015-06-041-9/+59
| | | | | | | | | | | | The generator should only have a function at generate time.
| * | cmMakefile: Refactor directories specified with the subdirs command.Stephen Kelly2015-06-041-0/+13
| | | | | | | | | | | | Store the directories on the cmMakefile as explicitly not-configured-yet.
generated by cgit v0.12 at 2025-02-04 17:15:10 (GMT)