summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'genex-generator-objects'Brad King2015-10-141-17/+23
|\ | | | | | | | | | | | | | | 2293d43d cmLocalGenerator: Store cmGeneratorTargets. 488723f5 cmMakefile: Store container of cmExportBuildFileGenerators. 15834405 cmGeneratorExpression: Port interface to cmGeneratorTarget. 11165525 cmGeneratorExpression: Port to cmLocalGenerator.
| * cmLocalGenerator: Store cmGeneratorTargets.Stephen Kelly2015-10-141-17/+0
| | | | | | | | Relieve cmMakefile of this responsibility.
| * cmMakefile: Store container of cmExportBuildFileGenerators.Stephen Kelly2015-10-141-0/+23
| | | | | | | | | | | | | | | | | | Set a cmLocalGenerator on each instance at compute time. That will soon be needed to access cmGeneratorTarget instances. If a cmExportBuildFileGenerator is processed early during configure time as a result of CMP0024 it must be removed from the list to process later at generate time.
* | Subdirs: Initialize from parent before configuring.Stephen Kelly2015-10-131-0/+1
| | | | | | | | | | | | | | 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-2/+0
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize default definitions immediately.Stephen Kelly2015-10-131-55/+0
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize current directories immediately.Stephen Kelly2015-10-131-26/+2
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize top level source directories immediately.Stephen Kelly2015-10-131-4/+0
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmMakefile: Set default internal definitions directly.Stephen Kelly2015-10-131-15/+15
| | | | | | | | The usage tracking of cmMakefile::AddDefinition is not needed.
* | cmMakefile: Set internal definitions directly.Stephen Kelly2015-10-131-6/+6
|/ | | | The usage tracking of cmMakefile::AddDefinition is not needed.
* Merge topic 'refactor-cache-manager'Brad King2015-10-121-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79a309d7 cmState: Port away from cmake instance. e2eecae2 cmState: Move ParseCacheEntry from cmCacheManager. b5212c68 cmState: Add API for cache version. 95b0d761 cmState: Externalize logic to caller. 6f02034e cmState: Make AddCacheEntry method private. 435a2f3c cmCacheManager: Port away from cmake instance. 062ed22e cmState: Add cache file manipulation wrappers. a02e53eb Inline unary LoadCache. bec3487f cmCacheManager: Remove cmMakefile dependency. e0f740f1 Always cache entries through the cmake instance. 2afadb0d cmake: Port away from trivial cmCacheManager use. 3d8c299f cmake: Use existing cache API wrapper.
| * Always cache entries through the cmake instance.Stephen Kelly2015-10-101-2/+2
| |
* | Merge topic 'add-cmLocalGenerator-API'Brad King2015-10-121-6/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 223d0efe Remove some needless GetMakefile() calls. a367416c cmLocalGenerator: Add current source directory accessor. bbef3c2d cmLocalGenerator: Add current binary directory accessor. 12cb3bdc cmLocalGenerator: Add Home directory accessors. 72efa15d Eclipse: Port API to cmLocalGenerator. f2a641d6 Kate: Remove unused variables. 10cf42f5 Kate: Port API to cmLocalGenerator. e46ef270 export: Port internal method to cmGeneratorTarget. 53d3a1c9 cmMakefile: Remove unused GetProjectName calls. 4ab2750c cmLocalGenerator: Add GetProjectName method. c8187f41 cmCPluginAPI: Inline code to get project name. 8c6e6dd3 cmMakefile: Inline initialization of project name. 27916f2c cmLocalGenerator: Add cmake instance accessor.
| * | cmMakefile: Remove unused GetProjectName calls.Stephen Kelly2015-10-081-5/+0
| | |
| * | cmMakefile: Inline initialization of project name.Stephen Kelly2015-10-081-1/+1
| |/
* | cmMakefile: Remove unneeded container clears.Stephen Kelly2015-10-081-3/+0
|/ | | | No need to do that in a destructor.
* cmState: Internalize the initialization of a snapshot from its parent.Stephen Kelly2015-10-071-2/+0
|
* Remove now-unused directory setters.Stephen Kelly2015-10-071-15/+0
|
* Set the current dirs on the snapshot before creating the cmMakefile.Stephen Kelly2015-10-071-17/+30
| | | | | | The cmMakefile should get a fully prepared snapshot and not clobber its definitions. It should eventually be able to process list files from any starting-point snapshot, though that is some refactoring away still.
* cmMakefile: Move invokation to initialize snapshot.Stephen Kelly2015-10-061-2/+3
|
* cmMakefile: Avoid name conflict with Solaris global typedefBrad King2015-09-301-2/+2
| | | | | | | | | On Solaris there is a global typedef called 'single': /usr/include/floatingpoint.h:77:15: note: shadowed declaration is here typedef float single; Avoid shadowing it by using a different name.
* cmMakefile: Remove Configured state.Stephen Kelly2015-09-271-4/+0
| | | | It is vestigial.
* cmGlobalGenerator: Create local generators after all makefiles configured.Stephen Kelly2015-09-241-5/+0
|
* cmMakefile: Create the local generator after configuring the makefile.Stephen Kelly2015-09-241-5/+5
| | | | The local generator is not used during configure time.
* cmMakefile: Skip Global targets for CMP0019 evaluation.Stephen Kelly2015-08-281-1/+2
|
* cmLocalGenerator: Create from already-constructed cmMakefile.Stephen Kelly2015-08-281-5/+4
| | | | Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
* cmGlobalGenerator: Remove MakeLocalGenerator method.Stephen Kelly2015-08-281-1/+1
| | | | Inline implementation to callers.
* cmMakefile: Remove cmLocalGenerator member.Stephen Kelly2015-08-281-5/+6
|
* cmLocalGenerator: Remove Parent pointer.Stephen Kelly2015-08-281-1/+1
|
* Merge topic 'minor-cleanups'Brad King2015-08-271-16/+10
|\ | | | | | | | | | | | | | | | | | | | | 7f551b4f cmGlobalGenerator: Implement VS6 check without virtual method. cd6293cd cmMakefile: Fix style. de6b2895 cmTarget: Remove vestigal method declaration. e35ee02d cmTarget: Fix indentation. 00f2298f Reduce uses of cmMakefile::GetGlobalGenerator. 6254ba95 cmMakefile: Remove Internal class. cf0a78dc cmGeneratorTarget: Issue messages through the local generator.
| * cmMakefile: Fix style.Stephen Kelly2015-08-251-1/+2
| |
| * cmMakefile: Remove Internal class.Stephen Kelly2015-08-251-15/+8
| | | | | | | | Move only remaining state to the direct class.
* | cmState: Move ProjectName from cmMakefile.Stephen Kelly2015-08-251-3/+3
| |
* | cmMakefile: Use std::string in ProjectName API.Stephen Kelly2015-08-251-2/+2
| |
* | cmMakefile: Out-of-line GetProjectName.Stephen Kelly2015-08-251-0/+4
|/
* cmState: Move directory Properties from cmMakefile.Stephen Kelly2015-08-241-139/+8
|
* cmMakefile: Inline GetDefinitions into GetProperty.Stephen Kelly2015-08-241-1/+5
| | | | It will soon move to cmState.
* Merge topic 'cmState-definitions'Brad King2015-08-241-108/+27
|\ | | | | | | | | | | | | | | | | | | 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-148/+13
| |
| * cmState: Add a VariableScope snapshot type.Stephen Kelly2015-08-231-0/+14
| | | | | | | | Match the scopes currently used in cmMakefile for definitions.
| * cmMakefile: Decouple the container of cmDefinitions from scoping logic.Stephen Kelly2015-08-231-24/+56
| | | | | | | | Maintain a Parent tree node for writing to in RaiseScope.
| * cmDefinitions: Implement in terms of cmLinkedTree.Stephen Kelly2015-08-231-19/+22
| | | | | | | | | | | | | | Store the definitions in a cmLinkedTree in the cmMakefile. This can be moved to cmState and then the tree will provide snapshotting possibilities. It will also make the Closure copy created at the start of each cmMakefile unnecesarry.
| * cmMakefile: Extract InitializeVarScope method.Stephen Kelly2015-08-231-1/+6
| |
* | Fix iOS Bundle layouts (#15669)Gregor Jasny2015-08-241-0/+12
|/ | | | | | | | | | In contrast to Mac OS X App bundle layout the iOS one lacks the Contents/MacOSX structure. See also the Bundle Structures documentation in Mac Developer Library: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html For now detect iOS targets by checking the SDK name/path.
* cmGlobalGenerator: Store a container of cmMakefiles.Stephen Kelly2015-08-071-0/+1
| | | | For use at configure-time.
* Merge topic 'cmState-policies'Brad King2015-08-061-98/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | 757a1f54 cmState: Move PolicyState from cmMakefile. 52dbe654 cmState: Record the end position of each directory. 65a5e0c6 cmLinkedTree: Add Clear API. 34835433 cmState: Add Type for policy scope. af0de01c cmState: Remove call stack parent tracking. 6ae8b30b cmMakefile: Move policy barriers inside cmState scopes. a5fc17b5 cmMakefile: Re-order policy entries and barriers. 0a01e6c6 cmState: Add Snapshot Type accessor. f0005bb4 Tests: Verify generate-time policy scope behavior.
| * cmState: Move PolicyState from cmMakefile.Stephen Kelly2015-08-021-84/+9
| | | | | | | | | | Implement lexical scope checking in terms of the state stack instead of barriers.
| * cmState: Add Type for policy scope.Stephen Kelly2015-08-021-0/+11
| |
| * cmMakefile: Move policy barriers inside cmState scopes.Stephen Kelly2015-08-011-22/+21
| |
| * cmMakefile: Re-order policy entries and barriers.Stephen Kelly2015-08-011-12/+11
| | | | | | | | Make the barriers surround the entries.