summaryrefslogtreecommitdiffstats
path: root/Source/cmState.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'reduce-cmState-accumulation' into ↵Brad King2015-11-251-30/+60
|\ | | | | | | reduce-cmState-accumulation-for-master
| * cmState: Avoid accumulating snapshot storage for short-lived scopesBrad King2015-11-251-0/+29
| | | | | | | | | | We need to keep only certain snapshot types and their ancestors. Also keep those needed for backtraces.
| * cmState: Avoid accumulating policy stack storage for short-lived scopesBrad King2015-11-251-1/+1
| | | | | | | | | | | | | | We enforce policy push/pop balance around any scope that pushes/pops a snapshot. Therefore a snapshot may never reference entries of PolicyStack that were created in nested scopes. Free storage of short-lived policy stack entries when they are popped.
| * cmLinkedTree: Rename 'Extend' method to 'Push'Brad King2015-11-251-29/+29
| | | | | | | | | | | | Logically the method pushes a nested scope on top of a given scope because the "up" pointer sequence forms a stack independent of any other branches of the tree.
| * cmState: Enforce policy scope balancing around variable scopesBrad King2015-11-251-0/+1
| | | | | | | | | | | | | | | | Everywhere we use cmMakefile::ScopePushPop to manage variable scopes also expects policy scopes to be balanced. There is no place that we use cmMakefile::PolicyPushPop without also using ScopePushPop. Relieve PolicyPushPop of responsibility for policy scope balance checks by moving it to ScopePushPop.
* | Merge topic 'fix-find_package-version-file-error-stack'Brad King2015-11-251-2/+4
|\ \ | |/ | | | | | | | | | | 62126b67 Merge branch 'test-cmake_policy-unmatched' into fix-find_package-version-file-error-stack 2e28c619 cmState: Skip variable scope snapshots to avoid call stack duplicates b219ff94 Tests: Add case for package version file unmatched policy scope
| * cmState: Skip variable scope snapshots to avoid call stack duplicatesBrad King2015-11-241-2/+4
| | | | | | | | | | | | | | | | | | Since commit v3.4.0-rc1~179^2~1 (cmState: Add a VariableScope snapshot type, 2015-08-23) the snapshot stack may have a VariableScopeType entry. Skip over these when constructing the call stack, just as we do for policy scopes. Otherwise we report the command causing the variable scope to be entered twice (e.g. find_package while loading a package version file).
* | cmState: Move GetTargetTypeName from cmTarget.Stephen Kelly2015-10-141-0/+27
| |
* | Subdirs: Initialize from parent before configuring.Stephen Kelly2015-10-131-0/+14
| | | | | | | | | | | | | | Add new API for the subdirs command to cmState. This fixes a regression introduced in commit f716460e (cmMakefile: Move invokation to initialize snapshot., 2015-10-06).
* | cmState: Initialize properties immediately.Stephen Kelly2015-10-131-0/+4
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize default definitions immediately.Stephen Kelly2015-10-131-0/+50
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize current directories immediately.Stephen Kelly2015-10-131-0/+8
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize top level source directories immediately.Stephen Kelly2015-10-131-0/+19
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Port away from cmake instance.Stephen Kelly2015-10-101-23/+24
| |
* | cmState: Move ParseCacheEntry from cmCacheManager.Stephen Kelly2015-10-101-0/+84
| |
* | cmState: Add API for cache version.Stephen Kelly2015-10-101-0/+10
| |
* | cmState: Externalize logic to caller.Stephen Kelly2015-10-101-1/+0
| |
* | cmCacheManager: Port away from cmake instance.Stephen Kelly2015-10-101-0/+1
| |
* | cmState: Add cache file manipulation wrappers.Stephen Kelly2015-10-101-0/+18
| |
* | cmState: Internalize the initialization of a snapshot from its parent.Stephen Kelly2015-10-071-0/+2
|/
* Merge topic 'fix-buildsystem-property-append'Brad King2015-09-141-2/+7
|\ | | | | | | | | | | | | | | ed258d60 Tests: Cover set_property for buildsystem directory properties fb45c371 cmState: Only append non-empty values to buildsystem properties. 158f7e31 cmMakefile: Use appropriate parameter name. 08ce3f48 cmTarget: Only append non-empty values to buildsystem properties.
| * cmState: Only append non-empty values to buildsystem properties.Stephen Kelly2015-09-111-0/+5
| | | | | | | | | | | | This is a change in behavior from CMake 3.3, but there is no semantic meaning to empty entries in buildsystem properties. This also restores behavior to that of CMake 2.8.10.
| * cmMakefile: Use appropriate parameter name.Stephen Kelly2015-09-111-2/+2
| |
* | cmState: Return end snapshot for GetBuildsystemDirectoryParent.Stephen Kelly2015-09-111-1/+2
|/ | | | | | | This is the appropriate snapshot for future use. Existing users of this method are mostly just calling GetDirectory on the result, but the progress tracking of the Makefile generator needs a consistent snapshot to be used, so the end snapshot should be consistently used.
* Merge topic 'cmState-ProjectName'Brad King2015-08-271-0/+12
|\ | | | | | | | | | | | | | | 637c56b4 cmGlobalGenerator: Implement FillProjectMap in terms of cmState. b3f2299e cmState: Move ProjectName from cmMakefile. 6ce940ac cmMakefile: Use std::string in ProjectName API. e8c0341d cmMakefile: Out-of-line GetProjectName.
| * cmState: Move ProjectName from cmMakefile.Stephen Kelly2015-08-251-0/+12
| |
* | Merge topic 'rm-cmLocalGenerator-Children'Brad King2015-08-271-1/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 867b5be8 cmLocalGenerator: Remove unused Children member. 6c832219 cmLocalGenerator: Implement child traversal in terms of cmState. 3fcf3837 Makefiles: Remove valueless cast. 223f4a66 cmLocalGenerator: Simplify condition. ae026f54 cmState: Store Children states in parent state.
| * | cmState: Store Children states in parent state.Stephen Kelly2015-08-241-1/+11
| |/
* | cmState: Make Snapshot EqualityComparable.Stephen Kelly2015-08-241-0/+10
|/
* cmState: Move directory Properties from cmMakefile.Stephen Kelly2015-08-241-0/+163
|
* Merge topic 'cmState-definitions'Brad King2015-08-241-2/+124
|\ | | | | | | | | | | | | | | | | | | bff27391 cmState: Host variable definitions. 6954c893 cmState: Add a VariableScope snapshot type. 1fc645bd cmState: Add a Base snapshot type. 0f070dd3 cmMakefile: Decouple the container of cmDefinitions from scoping logic. 25e04ddf cmDefinitions: Implement in terms of cmLinkedTree. 4bbe261c cmMakefile: Extract InitializeVarScope method.
| * cmState: Host variable definitions.Stephen Kelly2015-08-231-0/+102
| |
| * cmState: Add a VariableScope snapshot type.Stephen Kelly2015-08-231-0/+19
| | | | | | | | Match the scopes currently used in cmMakefile for definitions.
| * cmState: Add a Base snapshot type.Stephen Kelly2015-08-231-2/+3
| | | | | | | | For completeness mostly.
* | Merge topic 'refactor-progress'Brad King2015-08-241-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fa1b964 cmGlobalUnixMakefileGenerator3: Change the progress container key. 55e39276 cmState: Make it possible to order cmState::Snapshot. 04168cbb cmGlobalUnixMakefileGenerator3: Rename member. 2394584c cmGlobalGenerator: Rename progress initializer method. b9eb3cd1 cmGlobalGenerator: Move LG to target map to subclass. f5d2b7a6 cmGlobalGenerator: Remove clearance of map.
| * | cmState: Make it possible to order cmState::Snapshot.Stephen Kelly2015-08-231-0/+6
| |/
* | include_directories: Fix regression in BEFORE option (#15693)Brad King2015-08-211-6/+5
|/ | | | | | Refactoring in commit 6ed9c7e0 (cmState: Host buildsystem properties for directories, 2015-07-18) broke include_directories(BEFORE). Fix it and add a test case.
* cmState: Move PolicyState from cmMakefile.Stephen Kelly2015-08-021-0/+116
| | | | | Implement lexical scope checking in terms of the state stack instead of barriers.
* cmState: Record the end position of each directory.Stephen Kelly2015-08-021-2/+14
| | | | | At generate time, variables and policies are determined from the end state of the cmMakefile.
* cmState: Add Type for policy scope.Stephen Kelly2015-08-021-2/+20
|
* cmState: Remove call stack parent tracking.Stephen Kelly2015-08-011-11/+1
| | | | | | This was added at a time when I thought the cmState would report errors, but that is not the direction it is going. The ordering of the stack of scopes is canonical and clients are required to maintain it.
* cmState: Add Snapshot Type accessor.Stephen Kelly2015-08-011-0/+5
|
* cmState: Host buildsystem properties for directories.Stephen Kelly2015-07-251-1/+305
|
* cmState: Fix compilation on IBM XL compilerBrad King2015-07-251-0/+6
| | | | | Delay use of the PositionType constructor until after SnapshotDataType is fully defined.
* Merge topic 'cmState-Directory'Brad King2015-07-211-36/+46
|\ | | | | | | | | | | 9ebc7502 cmState: Extract a Directory class. 27ec21db cmState: Forward-declare a type earlier.
| * cmState: Extract a Directory class.Stephen Kelly2015-07-181-36/+46
| | | | | | | | | | Move Directory-scoped state accessors to it. This will be expanded with directory property state soon.
* | cmState: Remove unused variable.Stephen Kelly2015-07-181-2/+0
|/
* Merge topic 'fix-command-rename'Brad King2015-07-131-0/+11
|\ | | | | | | | | d4f032b5 cmState: Restore renamed commands on cleanup.
| * cmState: Restore renamed commands on cleanup.Stephen Kelly2015-07-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | Commit v3.3.0-rc1~196^2~7 (cmake: Simplify command clean up loop., 2015-04-12) introduced a bug that built-in commands which were renamed no longer had their original name restored when cleanup is performed between configure runs. Check for that and restore the commands with their original name. Extend the complex test for this. That test is run by ctest with the --build-two-config command line option.
* | cmState: Store execution context.Stephen Kelly2015-07-051-5/+66
| | | | | | | | | | Extend snapshot creation API to store the file being executed and the entry point to get to that context.