summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-minor-refactoring'Brad King2014-11-175-38/+27
|\ | | | | | | | | | | | | 67bd514a Ninja: Refactor restat to be a string internally ef42e57d Ninja: Use a TARGET_FILE variable to hold the link output file 592644c4 Tests/BuildDepends: Drop unneeded help for Ninja
| * Ninja: Refactor restat to be a string internallyBrad King2014-11-144-15/+15
| | | | | | | | | | This will allow values other than "" and "1" to be generated in the rules.ninja file.
| * Ninja: Use a TARGET_FILE variable to hold the link output fileBrad King2014-11-141-18/+11
| | | | | | | | | | | | Use an explicit "$TARGET_FILE" variable instead of "$out" so that we can have multiple output files while still only referencing the main one in command lines.
| * Tests/BuildDepends: Drop unneeded help for NinjaBrad King2014-11-141-5/+1
| | | | | | | | | | The extra post-modification invocations of 'ninja' does not seem to be needed anymore for the BuildDepends test to pass.
* | Merge branch 'release'Brad King2014-11-170-0/+0
|\ \
| * \ Merge branch 'vs14-is-2015' into releaseBrad King2014-11-175-18/+38
| |\ \
| * \ \ Merge branch 'kwsys-SharedForward-vs14' into releaseBrad King2014-11-171-1/+1
| |\ \ \
* | \ \ \ Merge topic 'kwsys-SharedForward-vs14'Brad King2014-11-170-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 480ed9cd KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limit
| * | | | KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limitBrad King2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 14 (2015) complains if a static character array is declared with more than 65535 elements. This limit should be large enough for SharedForward clients, so just hard-code that instead of trying to compute a limit.
* | | | | Merge topic 'update-kwsys'Brad King2014-11-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afc557d1 Merge branch 'upstream-kwsys' into update-kwsys c5fcbe00 KWSys 2014-11-14 (dec9c30b)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-11-171-1/+1
| |\ \ \ \ \ |/ / / / / /
| * | | | | KWSys 2014-11-14 (dec9c30b)KWSys Robot2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ dec9c30b | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 5843f590..dec9c30b Brad King (1): dec9c30b SharedForward: Hard-code the ldpath buffer size to below VS 14 limit Change-Id: I3430e77f71e68c2eb4f29369080c97afb1613c33
* | | | | | Merge topic 'console-pool'Brad King2014-11-1725-36/+172
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d75d7e5 Help: Add notes for topic 'console-pool' f42d86f0 Ninja: Implement USES_TERMINAL using the console pool if available f281ae01 Ninja: Remove unused declaration d5eae556 Ninja: factor out the test for console pool support 4d1fedf4 Give the interactive cache editor the USES_TERMINAL property fe5d6e8c Add USES_TERMINAL option for custom commands ad6ee426 Rename doing_verbatim to doing_nothing
| * | | | | Help: Add notes for topic 'console-pool'Peter Collingbourne2014-11-141-0/+8
| | | | | |
| * | | | | Ninja: Implement USES_TERMINAL using the console pool if availablePeter Collingbourne2014-11-144-0/+13
| | | | | |
| * | | | | Ninja: Remove unused declarationPeter Collingbourne2014-11-141-1/+0
| | | | | |
| * | | | | Ninja: factor out the test for console pool supportPeter Collingbourne2014-11-142-3/+10
| | | | | |
| * | | | | Give the interactive cache editor the USES_TERMINAL propertyPeter Collingbourne2014-11-142-13/+16
| | | | | |
| * | | | | Add USES_TERMINAL option for custom commandsPeter Collingbourne2014-11-1417-17/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the add_custom_command and add_custom_target commands a new USES_TERMINAL option. Use it to tell the generator to give the command direct access to the terminal if possible.
| * | | | | Rename doing_verbatim to doing_nothingPeter Collingbourne2014-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are about to introduce another property here, so give this a better name.
* | | | | | Merge topic 'test-custom-command-errors'Brad King2014-11-1729-0/+85
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | 39baf728 Tests: Test add_custom_command and add_custom_target error cases
| * | | | | Tests: Test add_custom_command and add_custom_target error casesBrad King2014-11-1429-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RunCMake.add_custom_command and RunCMake.add_custom_target tests to cover the error messages for these commands.
* | | | | | Merge topic 'vs14-is-2015'Brad King2014-11-175-18/+38
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | f5afb90d VS: Rename VS 14 generator to 'Visual Studio 14 2015'
| * | | | | VS: Rename VS 14 generator to 'Visual Studio 14 2015'Brad King2014-11-145-18/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we know the year component of this VS version we can add it to the generator name. For convenience, map the name without the year to the name with the year.
* | | | | | Merge topic 'fix-vs2015-warnings'Brad King2014-11-172-8/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b138be07 cmVisualStudio10TargetGenerator: fix a narrowing warning 8d379cd7 cmCallVisualStudioMacro: fix a shadowing warning
| * | | | | | cmVisualStudio10TargetGenerator: fix a narrowing warningBen Boeckel2014-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xAA literals are integers which doesn't fit into a char array. C++11 says this is an error and VS2015 now warns about it.
| * | | | | | cmCallVisualStudioMacro: fix a shadowing warningBen Boeckel2014-11-131-6/+7
| | | | | | |
* | | | | | | Merge topic 'CPackRPM_SUBSTRING_-1'Brad King2014-11-171-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cc8169b CPackRPM: remove unneeded string length calculation
| * | | | | | | CPackRPM: remove unneeded string length calculationRolf Eike Beer2014-11-141-3/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This wants just the rest of the string, which can be achieved by passing -1 as remainder length.
* | | | | | | Merge topic 'string-SUBSTRING-truncate'Brad King2014-11-174-11/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 474bbb9d string: Tolerate SUBSTRING length exceeding end index
| * | | | | | | string: Tolerate SUBSTRING length exceeding end indexDomen Vrankar2014-11-134-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string SUBSTRING command now ignores length if it points past end of string and uses end of string instead. String SUBSTRING tests now cover more corner cases.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-11-171-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-11-161-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-11-151-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release'Brad King2014-11-140-0/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'vs-nsight-tegra-version' into releaseBrad King2014-11-131-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'no-cmake-self-install-when-cross-compiling' into releaseBrad King2014-11-131-1/+2
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'doc-add_custom_command'Brad King2014-11-141-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cacf739 Help: Document add_custom_command marking outputs GENERATED
| * | | | | | | | | Help: Document add_custom_command marking outputs GENERATEDBrad King2014-11-141-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge topic 'vs-nsight-tegra-version'Brad King2014-11-141-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bb3c87f1 VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9
| * | | | | | | | | VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9Dmitry Polyanitsa2014-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A hotfix to Nsight Tegra 2.0 needed to increase the project number. Teach CMake to generate the newer number for this version.
* | | | | | | | | | Merge topic 'doc-add_custom_target'Brad King2014-11-141-29/+64
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 66ea634b Help: Revise and format 'add_custom_target' docs
| * | | | | | | | | Help: Revise and format 'add_custom_target' docsBrad King2014-11-131-29/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format the reStructuredText markup manually. Organize the command options into a definition list. Use inline markup to cross-reference related documents.
* | | | | | | | | | Merge topic 'no-cmake-self-install-when-cross-compiling'Brad King2014-11-141-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 15f55cca Do not use just-built CMake to install itself when cross-compiling (#15248)
| * | | | | | | | | Do not use just-built CMake to install itself when cross-compiling (#15248)Brad King2014-11-131-1/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The special case added by commit v2.4.0~3051 (When building CMake itself, use the new cmake to install so that the current cmake can be overwritten, 2004-06-09) does not make sense when cross-compiling.
* | | | | | | | | Merge topic 'fix-config-dependent-tests'Brad King2014-11-141-3/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0854d45b Tests: Build config-dependent tests in the same config they run
| * | | | | | | | | Tests: Build config-dependent tests in the same config they runBrad King2014-11-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CPackComponentsForAll-*, GeneratorExpression, and TestsWorkingDirectory tests all build binaries that they later need to run or package for the tested configuration. Tell the 'ctest --build-and-test' call to use the same configuration for driving the build process.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-11-141-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'add-FindIntl'Brad King2014-11-131-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b015b469 Help: Add notes for topic 'add-FindIntl'
| * | | | | | | | | Help: Add notes for topic 'add-FindIntl'Brad King2014-11-131-0/+5
| | | | | | | | | |