summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
* | | | | | | | Merge branch 'release'Brad King2014-11-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'no-AppleClang-C-features' into releaseBrad King2014-11-131-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'doc-install-SCRIPT-CODE-COMPONENT' into releaseBrad King2014-11-131-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2014-11-130-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | CMake 3.1.0-rc2v3.1.0-rc2Brad King2014-11-121-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'no-AppleClang-C-features'Brad King2014-11-131-1/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ded30405 Features: Don't record for AppleClang
| * | | | | | | Features: Don't record for AppleClangStephen Kelly2014-11-121-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features are currently recorded accidentally for all versions of AppleClang > 3.4 (I have no idea how that relates to upstream Clang). Presumably that version has the features which are accidentally recorded, but in the future features will be recorded initially for only AppleClang >= 5.1, which would appear as a feature regression. Commit v3.1.0-rc1~635^2~11 (Don't load Clang-CXX from AppleClang-CXX., 2013-11-11) ajusted the logic for the CXX language. Make a similar change for the C language.
* | | | | | | Merge topic 'add-FindIntl'Brad King2014-11-134-0/+74
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | c5e797db FindIntl: New module to find Gettext libintl
| * | | | | | FindIntl: New module to find Gettext libintlRoger Leigh2014-11-114-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Sun/Uniforum/GNU gettext libintl. This belongs in CMake rather than upstream because: * There are multiple upstreams (Sun, GNU). * It may or may not be in the glibc C library depending upon the platform and build options used. Although we already have a FindGettext module, that is for the tools. This module is for the library, and is independent because it's perfectly OK to use libintl without the gettext tools (and vice versa), and they might not all be found. Add cross references between the two modules in notes to make the relationship clearer.
* | | | | | | Merge topic 'file-GENERATE-source'Brad King2014-11-1324-3/+177
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b80557c7 file(GENERATE): Evaluate early to allow generating source files 0019d54b Genex: Fix whitespace issue.
| * | | | | | | file(GENERATE): Evaluate early to allow generating source filesStephen Kelly2014-11-1224-2/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The evaluation files must be known before cmTargetTraceDependencies attempts to find them, but we must actually generate the files after cmTargetTraceDependencies, as that can add to target SOURCES. The limitation is that the generated output name must not depend on the SOURCES of a target if the generated file is used by that target. Mark the output files as GENERATED so that trace dependencies does not expect them to already exist in the filesystem. Move the invokation of ForceLinkerLanguage in the Generate logic to after the generated file names are known. ForceLinkerLanguage tries to determine the sources of a target (in order to determine an already-known language) and otherwise fails to get information about the generated file. Test that the output of file(GENERATE) can be used as a target source file and that accessing the target SOURCES in the name of the output file is an error. Accessing the TARGET_OBJECTS would be a similar error if it was legal to use that generator expression in this context. That is not currently possible and is a different error condition, so test the current error output as a reminder to change the expected output if that becomes possible in the future. Test that generated rule files resulting from cmTargetTraceDependencies appear in the SOURCES generated in the output file.
| * | | | | | | Genex: Fix whitespace issue.Stephen Kelly2014-11-111-1/+1
| |/ / / / / /