summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Include cmAlgorithms where it is used.Stephen Kelly2015-03-1044-0/+48
|
* Merge topic 'target-language-genex'Brad King2015-03-1022-176/+299
|\ | | | | | | | | | | | | | | | | | | | | 232a6883 Help: Add release notes for target-language-genex. 9e168941 File(GENERATE): Process genex evaluation files for each language. b734fa44 Genex: Allow COMPILE_LANGUAGE when processing include directories. 0b945ea9 Genex: Allow COMPILE_LANGUAGE when processing compile definitions. 5c559f11 Genex: Enable use of COMPILE_LANGUAGE for compile options. e387ce7d Genex: Add a COMPILE_LANGUAGE generator expression. 4a0128f4 VS6: Compute CMAKE_*_FLAGS and COMPILE_DEFINITIONS* only when needed
| * File(GENERATE): Process genex evaluation files for each language.Stephen Kelly2015-03-092-15/+38
| |
| * Genex: Allow COMPILE_LANGUAGE when processing include directories.Stephen Kelly2015-03-098-45/+44
| | | | | | | | Issue an error if this is encountered by an IDE generator.
| * Genex: Allow COMPILE_LANGUAGE when processing compile definitions.Stephen Kelly2015-03-0915-42/+58
| | | | | | | | Issue an error if this is encountered by an IDE generator.
| * Genex: Enable use of COMPILE_LANGUAGE for compile options.Stephen Kelly2015-03-094-12/+55
| | | | | | | | | | | | Follow-ups will allow the use of the generator expression for compile definitions and include directories for non-IDE generators.
| * Genex: Add a COMPILE_LANGUAGE generator expression.Stephen Kelly2015-03-074-6/+43
| |
| * VS6: Compute CMAKE_*_FLAGS and COMPILE_DEFINITIONS* only when neededBrad King2015-03-071-70/+75
| | | | | | | | | | These placeholders are used only in the .dsp templates for targets that actually compile sources.
* | Merge topic 'ninja-check-root-robustly'Brad King2015-03-102-3/+2
|\ \ | | | | | | | | | | | | a6b09085 Ninja: Improve internal check for generating at the top-level (#15436)
| * | Ninja: Improve internal check for generating at the top-level (#15436)Brad King2015-03-092-3/+2
| | | | | | | | | | | | | | | Simply check for whether the local generator has a parent instead of depending on a string comparison of directory names.
* | | Merge topic 'configure_file-NEWLINE_STYLE-no-warn'Brad King2015-03-101-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | 024e25e4 Tests: Add more signature tests to RunCMake.configure_file test 3ef776fc configure_file: Do not warn about newline style arguments
| * | | configure_file: Do not warn about newline style argumentsBrad King2015-03-091-0/+7
| |/ / | | | | | | | | | | | | | | | | | | The unknown argument warning added by commit v3.2.0-rc1~452^2 (configure_file: Warn about unknown arguments, 2014-10-31) failed to account for options handled by the NewLineStyle member instead of directly in the main loop. Simply whitelist them for now.
* | | CMake Nightly Date StampKitware Robot2015-03-101-1/+1
| | |
* | | 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).