summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Teach --build to get VCExpress output (#15437)Brad King2015-03-101-4/+13
| | | | | | | VCExpress does not produce output if its pipes are connected to an interactive terminal. Add a special case to 'cmake --build' to capture the output through a pipe and re-print it instead of sharing output pipes with VCExpress.
* Merge topic 'cbp-unit-targets'Brad King2015-03-092-33/+42
|\ | | | | | | | | 099b0cab CodeBlocks: Declare which source file belongs to which targets.
| * CodeBlocks: Declare which source file belongs to which targets.Nils Gladitz2015-03-062-33/+42
| | | | | | | | | | | | This should allow the consuming IDE to determine which target specific preprocessor definitions and include directories are relevant for a given source file.
* | Merge topic 'fix-wixobj-filenames'Brad King2015-03-091-1/+19
|\ \ | | | | | | | | | | | | | | | 2e16aff1 CPackWIX: Fix .wixobj output locations and filenames. b0852ebc CPackWIX: Support patching of root <Feature> elements.
| * | CPackWIX: Fix .wixobj output locations and filenames.Nils Gladitz2015-03-061-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Preserve all but the last extension when generating .wixobj output filenames from source files and make sure they are unique. Output .wixobj files in cpack staging area instead of the current working directory.
| * | CPackWIX: Support patching of root <Feature> elements.Nils Gladitz2015-03-061-0/+1
| |/
* | Merge topic 'update-kwsys'Brad King2015-03-092-16/+124
|\ \ | | | | | | | | | | | | | | | 44ef4700 Merge branch 'upstream-kwsys' into update-kwsys aa84d26e KWSys 2015-03-03 (4890f30c)
| * | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-03-042-16/+124
| | |
* | | Merge topic 'custom-command-multiple-outputs'Brad King2015-03-096-74/+88
|\ \ \ | | | | | | | | | | | | | | | | 66a9c90c Makefile: Fix multiple custom command outputs regression (#15116)
| * | | Makefile: Fix multiple custom command outputs regression (#15116)Brad King2015-03-076-74/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.2.0-rc1~272^2~2 (Makefile: Fix rebuild with multiple custom command outputs, 2014-12-05) we changed the generated makefile pattern for multiple outputs from out1: depends... commands... out2: out1 to out1 out2: depends... commands... This was based on the incorrect assumption that make tools would treat this as a combined output rule and run the command(s) exactly once for them. It turns out that instead this new pattern is equivalent to out1: depends... commands... out2: depends... commands... so the commands may be run more than once. Some documents suggest using a "dedicated witness" stamp file: stamp: depends... rm -f stamp touch stamp.tmp commands... mv stamp.tmp stamp out1 out2: stamp However, if the commands fail the error message will refer to the stamp instead of any of the real outputs, which may be confusing to readers. Also, this approach seems to have the same behavior of the original approach that motiviated the above commit: multiple invocations are needed to bring consumers of the outputs up to date. Instead we can return to the original approach but add an explicit touch to each extra output rule: out1: depends... commands... out2: out1 touch -c out2 This causes make tools to recognize that all outputs have changed and therefore to execute any commands that consume them.
| * | | Merge branch 'backport-KWSys-SystemTools-CopyFileAlways-fix' into releaseBrad King2015-03-021-0/+4
| |\ \ \
| | * | | KWSys SystemTools: Update CopyFileAlways stream library workaroundsPaul Martin2015-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | On some stream libraries failbit is not set when trying to read past EOF. Instead, always exit the copy loop when gcount() is zero.
| * | | | Merge branch 'fix-crash-on-bad-LANG_STANDARD' into releaseBrad King2015-02-281-1/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'install-manifest-optimize' into releaseBrad King2015-02-262-12/+10
| |\ \ \ \ \
* | | | | | | CMake Nightly Date StampKitware Robot2015-03-091-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-03-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-03-071-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-03-061-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-03-051-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'fix-JOM-quiet-make'Brad King2015-03-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3e98ebba JOM: Pass /NOLOGO when driving builds as is done for NMake
| * | | | | JOM: Pass /NOLOGO when driving builds as is done for NMakeBrad King2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes RunCMake.(Configure|configure_file|try_compile) test failures that failed to match empty stderr due to jom printing its identification line.
* | | | | | CMake Nightly Date StampKitware Robot2015-03-041-1/+1
| | | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2015-03-031-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e88f3b3b Merge branch 'upstream-kwsys' into update-kwsys 7c9afb57 KWSys 2015-02-27 (d2aa1afd)
| * | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-03-021-0/+4
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2015-03-031-1/+1
|/ / / / /
* | | | | Merge topic 'fix-ctest-update-locale'Brad King2015-03-021-12/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6a661f06 CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES.
| * | | | | CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES.Nils Gladitz2015-02-271-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | If LC_ALL is set it takes precedence over LC_MESSAGES.
* | | | | | Merge topic 'fix-crash-on-bad-LANG_STANDARD'Brad King2015-03-021-1/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 00d66557 Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)
| * | | | | Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)Brad King2015-02-281-1/+8
| | |_|_|/ | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2015-03-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-03-011-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-02-281-1/+1
| | | | |
* | | | | Merge topic 'remove_error_read_script'Brad King2015-02-271-5/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6bf13097 CTest: Drop "Error in read script" message at end of testing
| * | | | | CTest: Drop "Error in read script" message at end of testingZack Galbreath2015-02-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A more-specific error message is always displayed earlier in the output if any real error occurred. This final summary message is distracting to readers searching through the output for the word "error". Simply drop it.
* | | | | | Merge topic 'cmake-build-ninja-verbose'Brad King2015-02-2717-22/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1082448 Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v' ce935ebe cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja
| * | | | | | cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for NinjaGregor Jasny2015-02-2617-22/+35
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja build system does not support a in-file verbositiy switch. Instead teach 'cmake --build' to extract the CMAKE_VERBOSE_MAKEFILE setting and pass it as an optional '-v' argument to Ninja. This can serve as a reasonable fallback. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | Merge topic 'install-manifest-optimize'Brad King2015-02-272-12/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | c4814174 install: Write the entire installation manifest at once
| * | | | | install: Write the entire installation manifest at onceRobert Goulet2015-02-262-12/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Avoid a separate open/close for each file installed. Use a single file(WRITE) instead of a loop with file(APPEND).
* | | | | Merge topic 'update-kwsys'Brad King2015-02-273-30/+59
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | 26656865 Merge branch 'upstream-kwsys' into update-kwsys 5e2b418f KWSys 2015-02-25 (1b75ad3d)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-02-263-30/+59
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2015-02-271-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2015-02-261-1/+1
| | |
* | | Merge topic 'vs-midl-absolute-OutputDirectory'Brad King2015-02-251-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 4ee9005d cmVisualStudio10TargetGenerator: Wrap long line
| * | | cmVisualStudio10TargetGenerator: Wrap long lineBrad King2015-02-241-1/+2
| | | |
* | | | Merge topic 'sln-no-bom'Brad King2015-02-252-10/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 987d4a12 VS: Do not generate a BOM in .sln files
| * | | VS: Do not generate a BOM in .sln filesBrad King2015-02-242-10/+0
| | |/ | |/| | | | | | | | | | | | | Revert commit v3.2.0-rc1~165^2 (Encoding: Write Visual Studio solution file with BOM, 2014-12-26). The BOM breaks the VS IDE version selector when loading the .sln from Windows Explorer.
| * | CMake 3.2.0-rc2v3.2.0-rc2Brad King2015-02-231-1/+1
| | |
| * | Merge branch 'private-FindJsonCpp' into releaseBrad King2015-02-201-0/+117
| |\ \
* | | | CMake Nightly Date StampKitware Robot2015-02-251-1/+1
| | | |
* | | | Merge topic 'cleanup-cmAlgorithms'Brad King2015-02-241-24/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47c2da6a cmAlgorithms: Cache the end iterators in algorithms. a5b10ae6 cmAlgorithms: Remove needless assignment. 7fd8557f cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices. 1f796791 cmAlgorithms: Relax iterator requirement for cmRemoveIndices. ba959934 cmAlgorithms: Make cmRemoveDuplicates work with more containers. cae45df7 cmAlgorithms: Rename template argument to RemoveN. b917f4c0 cmAlgorithms: Relax cmRemoveN requirement to FwdIter. bbc1a978 cmAlgorithms: Add a size() to cmRange. 47a3e22e cmAlgorithms: Rename template type in cmDeleteAll algorithm. cb75eec0 cmAlgorithms: Add const to const objects.