summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Port to cmMakefile::GetGlobalGenerator.Stephen Kelly2015-05-031-37/+26
|
* cmMakefile: Extract an accessor for the global generator.Stephen Kelly2015-05-031-1/+6
| | | | | | Both for convenience, and because cmMakefile should not be the way to get access to the local generator, so that should go away in the future.
* cmMakefile: Use GetCMakeInstance.Stephen Kelly2015-05-031-4/+2
|
* cmMakefile: Simplify GetCMakeInstance implementation.Stephen Kelly2015-05-031-5/+1
| | | | | No callers handle the possibility that it can return null, and that is no longer possible anyway.
* cmMakefile: Implement RaiseScope without relying on Parent.Stephen Kelly2015-04-301-20/+24
|
* cmMakefile: Implement RaiseScope in terms of local Get method.Stephen Kelly2015-04-301-1/+1
| | | | The cmDefinitions::Get will change behavior in follow up commits.
* Merge topic 'refactor-cmDefinitions'Brad King2015-04-301-50/+117
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b48ea26a cmDefinitions: Invert conditional code. 5ccff640 cmDefinitions: Externalize looping for ClosureKeys. f79cd99d cmDefinitions: Implement MakeClosure in terms of reverse iterators. aa4d1ee8 cmDefinitions: Convert MakeClosure into a static method. 60becdc6 cmDefinitions: Implement MakeClosure in terms of a list of ancestors. d858f363 cmDefinitions: Use list of cmDefinitions* to create closure. aaaa65b6 cmMakefile: Remove stack adaptor for the VarStack. f983d891 cmDefinitions: Replace recursion with loop. 24885d4e cmDefinitions: Replace private constructor with MakeClosure. 012a75a0 cmDefinitions: Make ClosureKeys API vector-based. ca9fa77d cmDefinitions: Inline GetClosureKeys implementation. 78e1454e cmDefinitions: Replace ClosureKeys recursion with looping. 818bf727 cmDefinitions: Change LocalKeys to return a vector. 5067ae41 cmDefinitions: Externalize the Set logic. 60200ca5 cmDefinitions: Add an Erase method. b43c162e cmMakefile: Use the Internal class to enclose the VarStack.
| * cmDefinitions: Externalize looping for ClosureKeys.Stephen Kelly2015-04-291-1/+10
| |
| * cmDefinitions: Implement MakeClosure in terms of reverse iterators.Stephen Kelly2015-04-291-9/+3
| | | | | | | | Iterate directly over the parent content provided by cmMakefile.
| * cmDefinitions: Convert MakeClosure into a static method.Stephen Kelly2015-04-291-1/+9
| | | | | | | | Accept a range of cmDefinitions*.
| * cmMakefile: Remove stack adaptor for the VarStack.Stephen Kelly2015-04-291-12/+12
| | | | | | | | | | | | | | | | | | The purpose of the stack is to allow access only to the top of it. Access to items which are not at the top is needed, so cmDefinitions objects get a Parent pointer. The existence of the Parent pointer is a workaround for the inappropriate use of stack in the first place. Remove it now.
| * cmDefinitions: Replace private constructor with MakeClosure.Stephen Kelly2015-04-291-1/+1
| |
| * cmDefinitions: Make ClosureKeys API vector-based.Stephen Kelly2015-04-291-3/+2
| | | | | | | | | | | | | | Construct the final list directly in a named return value. Use a single set to track bindings already found. Co-Author: Brad King <brad.king@kitware.com>
| * cmDefinitions: Change LocalKeys to return a vector.Stephen Kelly2015-04-291-5/+5
| | | | | | | | This is more efficient and we lose nothing.
| * cmDefinitions: Externalize the Set logic.Stephen Kelly2015-04-291-1/+9
| |
| * cmMakefile: Use the Internal class to enclose the VarStack.Stephen Kelly2015-04-291-46/+95
| | | | | | | | Put knowledge of the implementation details in one place.
* | Merge topic 'revert-CMP0057'Brad King2015-04-301-27/+0
|\ \ | |/ |/| | | | | 32a2f414 Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."
| * Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."Nils Gladitz2015-04-301-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 242c3966 (add_custom_command: Diagnose MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands, 2015-03-26). I misdiagnosed the underlying issue that prompted creation of policy CMP0057. The actual issue surfaces when a single custom command's MAIN_DEPENDENCY is listed in more than one target; this issue will have to be addressed independently.
* | cmState: Store the Current directories.Stephen Kelly2015-04-281-14/+8
| |
* | Introduce cmState::Snapshot.Stephen Kelly2015-04-281-1/+17
| | | | | | | | | | | | | | Create snapshots for buildsystem directories during configure time. This class will be extended in follow up commits to snapshot all values in the cmState.
* | cmMakefile: Require the localGenerator in the constructor.Stephen Kelly2015-04-281-42/+36
| | | | | | | | | | Move the contents of cmMakeile::SetLocalGenerator to the Initialize method.
* | cmLocalGenerator: Require a parent in the constructor.Stephen Kelly2015-04-281-2/+2
| | | | | | | | | | | | | | Pass the parent though cmGlobalGenerator::CreateLocalGenerator. This will make it easy to initialize state scopes independent of cmMakefile.
* | cmMakefile: Inline SetHome* methods into last remaining caller.Stephen Kelly2015-04-281-21/+17
| |
* | cmMakefile: Delegate storage of Home dirs to the cmake class.Stephen Kelly2015-04-281-13/+8
|/ | | | There is no need to duplicate these on every cmMakefile.
* Merge topic 'clean-up-cmMakefile'Brad King2015-04-211-22/+59
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dc3a67c cmMakefile: Out-of-line the directory methods. 0f3c8cfa cmMakefile: Use method abstraction to access directories. b288a997 cmMakefile: Rename SetStart* directory API to SetCurrent*. 932d53bc cmMakefile: Remove redundant method duplication. 32b8f03a cmMakefile: Port users of GetStart* methods to new names. 54d6a918 cmMakefile: Rename GetCurrent{Output,Binary}Directory. 55d80d0a cmMakefile: Rename GetCurrent{,Source}Directory. b23cf06f cmake: Remove redundant start directories. fcf246ac cmMakefile: Populate Home directories on initialize. 8878bea7 cmake: Initialize Home directories on cmake for find-package mode. 044dc815 Use the Home directories from the cmake class where intended. d67e8f24 cmake: Fix directory used to find the cache 1ea085d1 cmMakefile: Initialize dir definitions early. f034bb2f Remove redundant calls to MakeStartDirectoriesCurrent. 3a68c323 cmMakefile: Fix wrong parameter names.
| * cmMakefile: Out-of-line the directory methods.Stephen Kelly2015-04-211-0/+31
| |
| * cmMakefile: Use method abstraction to access directories.Stephen Kelly2015-04-211-7/+8
| |
| * cmMakefile: Rename SetStart* directory API to SetCurrent*.Stephen Kelly2015-04-201-2/+2
| |
| * cmMakefile: Port users of GetStart* methods to new names.Stephen Kelly2015-04-201-4/+4
| |
| * cmMakefile: Rename GetCurrent{,Source}Directory.Stephen Kelly2015-04-201-6/+6
| | | | | | | | Match the names used in cmake code.
| * cmake: Remove redundant start directories.Stephen Kelly2015-04-201-2/+0
| | | | | | | | | | | | | | | | | | They are maintained as containing the same content as the 'home' directories, but they are never read from. Fix some comments and help strings which confused the two by name. They actually mean what is called CMAKE_SOURCE_DIR in cmake code.
| * cmMakefile: Populate Home directories on initialize.Stephen Kelly2015-04-201-0/+3
| |
| * cmMakefile: Initialize dir definitions early.Stephen Kelly2015-04-201-1/+5
| |
| * cmMakefile: Fix wrong parameter names.Stephen Kelly2015-04-201-2/+2
| |
* | cmMakefile: Disable copy constructor.Stephen Kelly2015-04-201-46/+0
|/ | | | | It is no longer necessary to be able to copy it. Additionally, this gives us one less reason to copy cmTarget.
* cmMakefile: Move some preamble out of the Internal method.Stephen Kelly2015-04-181-8/+8
|
* cmMakefile: Remove always-null first parameter to ReadListFile.Stephen Kelly2015-04-181-16/+6
|
* cmMakefile: Swap parameters of calls to ReadListFile.Stephen Kelly2015-04-181-1/+1
| | | | The version with a null first parameter is now equivalent.
* cmMakefile: Extract conditional code to caller.Stephen Kelly2015-04-181-5/+1
|
* cmMakefile: Remove intermediate variable.Stephen Kelly2015-04-181-3/+2
|
* cmMakefile: Move condition to the only calling context where it is true.Stephen Kelly2015-04-181-8/+5
| | | | | | | | Call the Internal method with equivalent parameters, passing a null first argument. A duplicate path computation exists inside the external_in condition now, but that is harmless at this point.
* cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers.Stephen Kelly2015-04-181-1/+2
| | | | | | | | | Because all external callers of this method pass a null first parameter, this change has no effect for them. This also makes it obvious that the CMAKE_PARENT_LIST_FILE is set to the name of the file being read itself for CMakeLists.txt files, which may not make any sense.
* cmMakefile: Collapse nested conditional.Stephen Kelly2015-04-181-7/+4
|
* cmMakefile: Convert filenametoread into a std::string.Stephen Kelly2015-04-181-11/+9
| | | | Remove other intermediate variables.
* cmMakefile: Remove intermediate variable.Stephen Kelly2015-04-181-3/+1
|
* cmMakefile: Combine duplicate condition.Stephen Kelly2015-04-181-3/+0
|
* cmMakefile: Re-order independent statements.Stephen Kelly2015-04-181-6/+5
|
* cmMakefile: Split a conditional.Stephen Kelly2015-04-181-0/+4
|
* cmMakefile: Re-order independent variable setting.Stephen Kelly2015-04-181-4/+4
|
* cmMakefile: Remove intermediate variable.Stephen Kelly2015-04-181-4/+2
|