summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge topic 'cpack-deb-component-vars-prepare'Brad King2015-04-212-235/+259
|\ \ | | | | | | | | | | | | c8375e15 CPackDeb: Refactor package variable lookup by generator
| * | CPackDeb: Refactor package variable lookup by generatorDomen Vrankar2015-04-212-235/+259
| | | | | | | | | | | | | | | | | | | | | | | | 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 'FindCUDA.cmake/Fix-MakeDirDuringSeparableCompilation'Brad King2015-04-211-0/+2
|\ \ \ | |/ / |/| | | | | | | | 0ed22502 FindCUDA: Create output dir while compiling intermediate link file (#15016)
| * | FindCUDA: Create output dir while compiling intermediate link file (#15016)James Bigler2015-04-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | During compilation of the intermediate link file, the output directory may not be present in Visual Studio builds. This fix makes sure the output directory exists before generating the output file. Suggested-by: Irwin Zaid
* | | Merge topic 'cmSystemTools-RunSingleCommand-stderr'Brad King2015-04-2123-69/+110
|\ \ \ | | | | | | | | | | | | | | | | 356c26eb cmSystemTools: Teach RunSingleCommand to separate stdout and stderr
| * | | cmSystemTools: Teach RunSingleCommand to separate stdout and stderrBrad King2015-04-2023-69/+110
| | |/ | |/| | | | | | | | | | | | | | | | 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.
* | | Merge topic 'cpack-rpm-refactored-file-listing'Brad King2015-04-215-71/+167
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cd953bf7 Help: Add notes for topic 'cpack-rpm-refactored-file-listing' 76080c32 CPackRPM content listing refactor 152e9b32 CPackRPM package content list code move
| * | | Help: Add notes for topic 'cpack-rpm-refactored-file-listing'Brad King2015-04-201-0/+6
| | | |
| * | | CPackRPM content listing refactorDomen Vrankar2015-04-194-30/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of content list that removes use of find and sed to make listing algorithm more clear and remove external dependencies. Patch also limits man pages handling to locations listed in brp-compress rpm script by default - fixes bug report #14660.
| * | | CPackRPM package content list code moveDomen Vrankar2015-04-191-70/+77
| | | | | | | | | | | | | | | | | | | | Move rpm package content list code to a separate function.
* | | | Merge topic 'ExternalProject-test-refactor'Brad King2015-04-216-58/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 28429270 Tests: Delay RunCMake.ExternalProject case checks
| * | | | Tests: Delay RunCMake.ExternalProject case checksBrad King2015-04-206-58/+63
| | | | | | | | | | | | | | | | | | | | | | | | | Use RunCMake "-check.cmake" scripts to check the generated initial cache file content so that the full generation process is completed.
* | | | | 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.
* | | | Merge topic 'add-GreenHills-MULTI-generator'Brad King2015-04-2041-11/+1889
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66b641f4 Help: Add notes for topic 'add-GreenHills-MULTI-generator' 48004d9d Add a 'Green Hills MULTI' generator on Windows 051d8be1 cmLocalGenerator: Constify some cmTarget and cmGeneratorTarget arguments
| * | | | Help: Add notes for topic 'add-GreenHills-MULTI-generator'Brad King2015-04-201-0/+8
| | | | |
| * | | | Add a 'Green Hills MULTI' generator on WindowsGeoff Viola2015-04-2038-1/+1868
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Green Hills MULTI is an IDE for embedded real-time systems. The IDE's product page can be found here: http://www.ghs.com/products/MULTI_IDE.html It supports cross compiling on ARM, Intel x86, and other architectures with various operating systems. The IDE exists on Linux and Windows host systems, but CMake will currently only generate the project files on Windows host systems.
| * | | | cmLocalGenerator: Constify some cmTarget and cmGeneratorTarget argumentsGeoff Viola2015-04-092-10/+13
| | | | |
* | | | | Merge topic 'doc-PDB_NAME-fallback'Brad King2015-04-201-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 164f1df2 Help: Clarify PDB_NAME fallback behavior (#15518)
| * | | | | Help: Clarify PDB_NAME fallback behavior (#15518)Brad King2015-04-171-1/+2
| | |/ / / | |/| | | | | | | | | | | | | It uses the OUTPUT_NAME if set, not always the target name.
* | | | | Merge topic 'stable-xcode-projects'Brad King2015-04-205-16/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6693590f Xcode: Refine quoting rules for Strings a6331eb8 Xcode: Let PrintComment decide if the comment is non-empty 6e8952c1 Xcode: PrintComment will prepend a whitespace itself before the comment 4bd2544b Xcode: Do not add whitespace after attribute group opening brace 5cb4c838 Xcode: Properly indent PBXFileReference and PBXBuildFile a723427b Xcode: Remove extra space in PBXProject comment 2fe8bca5 Xcode: Add comment after root object 2e0e205e Xcode: Indent using tabs 7b68c8df Xcode: Sort Xcode objects by Id