summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'clean-up-cmMakefile'Brad King2015-04-2174-434/+360
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-212-37/+35
| |
| * cmMakefile: Use method abstraction to access directories.Stephen Kelly2015-04-211-7/+8
| |
| * cmMakefile: Rename SetStart* directory API to SetCurrent*.Stephen Kelly2015-04-205-10/+10
| |
| * cmMakefile: Remove redundant method duplication.Stephen Kelly2015-04-201-8/+0
| |
| * cmMakefile: Port users of GetStart* methods to new names.Stephen Kelly2015-04-2039-142/+146
| |
| * cmMakefile: Rename GetCurrent{Output,Binary}Directory.Stephen Kelly2015-04-2039-73/+73
| | | | | | | | Match names used in CMake code.
| * cmMakefile: Rename GetCurrent{,Source}Directory.Stephen Kelly2015-04-2031-61/+65
| | | | | | | | Match the names used in cmake code.
| * cmake: Remove redundant start directories.Stephen Kelly2015-04-205-69/+5
| | | | | | | | | | | | | | | | | | 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-202-6/+3
| |
| * cmake: Initialize Home directories on cmake for find-package mode.Stephen Kelly2015-04-201-4/+5
| | | | | | | | | | The Home directories can be used to initialize cmMakefile directories internally.
| * Use the Home directories from the cmake class where intended.Stephen Kelly2015-04-202-7/+7
| |
| * cmake: Fix directory used to find the cacheStephen Kelly2015-04-201-1/+1
| | | | | | | | | | The start and home directories are the same, but the intent of the code here is to use what is currently called the HomeOutput directory.
| * cmMakefile: Initialize dir definitions early.Stephen Kelly2015-04-202-9/+5
| |
| * Remove redundant calls to MakeStartDirectoriesCurrent.Stephen Kelly2015-04-203-3/+0
| | | | | | | | The SetStart{,Output}Directory methods do what it does.
| * cmMakefile: Fix wrong parameter names.Stephen Kelly2015-04-202-5/+5
| |
* | Merge topic 'disable-cmMakefile-copy'Brad King2015-04-213-49/+4
|\ \ | | | | | | | | | | | | | | | 80909041 cmMakefile: Disable copy constructor. f3af9517 CPack: Don't copy cmMakefile. Just push a scope instead.
| * | cmMakefile: Disable copy constructor.Stephen Kelly2015-04-202-47/+2
| | | | | | | | | | | | | | | It is no longer necessary to be able to copy it. Additionally, this gives us one less reason to copy cmTarget.
| * | CPack: Don't copy cmMakefile. Just push a scope instead.Stephen Kelly2015-04-201-2/+2
| |/
* | CPackDeb: Refactor package variable lookup by generatorDomen Vrankar2015-04-211-39/+36
| | | | | | | | | | | | | | | | Preparation for per component variables. Patch makes sure we know which variables will be set for per component generator and also prevents accidental overflows of variable values between components.
* | Merge topic 'cmSystemTools-RunSingleCommand-stderr'Brad King2015-04-2122-68/+109
|\ \ | | | | | | | | | | | | 356c26eb cmSystemTools: Teach RunSingleCommand to separate stdout and stderr
| * | cmSystemTools: Teach RunSingleCommand to separate stdout and stderrBrad King2015-04-2022-68/+109
| |/ | | | | | | | | | | | | Extend the RunSingleCommand signature to capture stdout and stderr separately. Allow both to be captured to the same std::string to preserve existing behavior. Update all call sites to do this so that this refactoring does not introduce functional changes.
* | CMake Nightly Date StampKitware Robot2015-04-211-1/+1
|/
* Merge topic 'clean-up-ReadListFile'Brad King2015-04-2018-143/+106
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05245b42 cmMakefile: Move some preamble out of the Internal method. 6e23a4bd cmMakefile: Remove always-null first parameter to ReadListFile. d21ebcb2 cmMakefile: Swap parameters of calls to ReadListFile. 95a27267 cmMakefile: Extract conditional code to caller. 7d248547 cmMakefile: Remove intermediate variable. 9db15954 cmMakefile: Move condition to the only calling context where it is true. 5d4480a8 cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers. 3a8ac242 cmMakefile: Collapse nested conditional. 5947d9b0 cmMakefile: Convert filenametoread into a std::string. e2d0e0fb cmMakefile: Remove intermediate variable. 3a1ad171 cmMakefile: Combine duplicate condition. f0dae032 cmMakefile: Re-order independent statements. 08da8742 cmMakefile: Split a conditional. 3dc4fe02 cmMakefile: Re-order independent variable setting. e4f8f1f1 cmMakefile: Remove intermediate variable. 2d6121a9 cmMakefile: Remove use of intermediate variable. ...
| * 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-1813-50/+39
| |
| * 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
| |
| * cmMakefile: Remove use of intermediate variable.Stephen Kelly2015-04-181-2/+2
| |
| * cmMakefile: Move variable definition above a condition.Stephen Kelly2015-04-181-3/+2
| |
| * cmMakefile: Change condition to its equivalent.Stephen Kelly2015-04-181-1/+1
| | | | | | | | This makes it easier to reason about follow-up commits.
| * cmMakefile: Determine the file to read before calling Internal.Stephen Kelly2015-04-182-37/+36
| |
| * cmMakefile: Remove duplication in ReadListFile.Stephen Kelly2015-04-181-32/+28
| |
| * cmMakefile: Delegate ListFile reading to internal method.Stephen Kelly2015-04-182-0/+15
| |
| * cmMakefile: Remove useless condition.Stephen Kelly2015-04-181-4/+1
| |
| * cmMakefile: Add wrapper for reading listfiles which have an origin.Stephen Kelly2015-04-188-15/+16
| | | | | | | | | | | | Such files are delegates from other files, and so they set the CMAKE_PARENT_LIST_FILE to the originator. They also may set a policy scope.
| * cmMakefile: Add a method for processing buildsystem files.Stephen Kelly2015-04-183-18/+13
| | | | | | | | | | These are different from other ListFiles in that a project() command is required if it is top-level.
| * cmMakefile: Remove fullPath parameter from ReadListFile.Stephen Kelly2015-04-184-15/+3
| | | | | | | | | | | | There is no reason for this to be a responsibility of ReadListFile. Additionally, the only user of it already computes it itself.
| * CPack: Read the config listfile in the normal way.Stephen Kelly2015-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a unique function call in CMake, and it was likely a programming error when introduced. All other similar calls to ReadListFile use a null first paramter. The effect of this patch is to no-longer define CMAKE_PARENT_LIST_FILE to the config file itself while evaluating it. The ReadListFile method also no longer hits a condition that it uses CollapseFullPath on the input file. However, as cpack does not set the StartDirectory anyway, this has no effect. See bug 15522.