summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ExternalProject-byproducts-tokens'Brad King2015-03-103-3/+29
|\ | | | | | | | | 86032ae0 ExternalProject: Replace placeholder tokens in BYPRODUCTS
| * ExternalProject: Replace placeholder tokens in BYPRODUCTSGaëtan Lehmann2015-03-093-3/+29
| | | | | | | | | | | | This allows the developer to specify the byproducts relative to the binary directory without the need to set the binary directory location explicitly.
* | Merge topic 'UseSWIG-fix-CMP0054-warnings'Brad King2015-03-101-4/+4
|\ \ | | | | | | | | | | | | 458c9e95 UseSWIG: Avoid if() auto-dereferene in quoted arguments
| * | UseSWIG: Avoid if() auto-dereferene in quoted argumentsBrad King2015-03-091-4/+4
| | | | | | | | | | | | | | | | | | | | | Protect against variables named "CSHARP", "PERL", "PYTHON", or "UNKNOWN" when CMP0054 is not set to NEW. Reported-by: Tuukka Pasanen <tuukka@iocaste.ilmi.fi>
* | | 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-1028-42/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | 024e25e4 Tests: Add more signature tests to RunCMake.configure_file test 3ef776fc configure_file: Do not warn about newline style arguments
| * | | Tests: Add more signature tests to RunCMake.configure_file testBrad King2015-03-0927-42/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the test cases from Tests/CMakeTests/ConfigureFileTest.cmake.in over to use the RunCMake.configure_file infrastructure. This does much more robust verification of CMake output for each test case, and would have caught the regression fixed in our parent commit.
| * | | 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-092-3/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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-062-2/+5
| |/ /
* | | 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
| |\ \ \
| | * | | KWSys 2015-03-03 (4890f30c)KWSys Robot2015-03-042-16/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 4890f30c | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' d2aa1afd..4890f30c Domen Vrankar (2): 5d6204e9 Glob: Handle symlink cycles in directory paths 4890f30c Glob: Add support for directory listing Change-Id: Id8b77dabf8f50efeffdeaf1c826154fd2a25e17b
* | | | | 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.
* | | | | | 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 'InstallRequiredSystemLibraries-COMPONENT'Brad King2015-03-042-27/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e97141c2 InstallRequiredSystemLibraries: Add option to specify install COMPONENT d6a320ab InstallRequiredSystemLibraries: Format documentation
| * | | | InstallRequiredSystemLibraries: Add option to specify install COMPONENTJohan Andruejol2015-03-032-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the module did not support projects using installation components because install(PROGRAMS) was never called with COMPONENT. Add an option to specify the COMPONENT so that projects doing this do not have to resort to using CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP and writing the install rule by hand.
| * | | | InstallRequiredSystemLibraries: Format documentationBrad King2015-03-031-25/+34
| | | | |
* | | | | 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.
* | | | | | Merge branch 'release'Brad King2015-03-040-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.2.0v3.2.0Brad King2015-03-031-1/+1
| | |_|/ / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-03-041-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release'Brad King2015-03-030-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'backport-KWSys-SystemTools-CopyFileAlways-fix' into releaseBrad King2015-03-021-0/+4
| |\ \ \ \
* | \ \ \ \ Merge topic 'backport-KWSys-SystemTools-CopyFileAlways-fix'Brad King2015-03-030-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | b8ea771b KWSys SystemTools: Update CopyFileAlways stream library workarounds
| * | | | | 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 topic 'cpack-strict-variable-selection'Brad King2015-03-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3b9f963f CPack: be more stringent when selecting variables to encode
| * | | | | CPack: be more stringent when selecting variables to encodeРоман Донченко2015-03-021-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | The old version would admit, for example, a variable named "xxxCPACK".
* | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | KWSys 2015-02-27 (d2aa1afd)KWSys Robot2015-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d2aa1afd | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 1b75ad3d..d2aa1afd Paul Martin (1): d2aa1afd SystemTools: Update CopyFileAlways stream library workarounds Change-Id: I676f2f11ac0d52f7ffc3af5bb444d3726c121be0
* | | | | CMake Nightly Date StampKitware Robot2015-03-031-1/+1
|/ / / /
* | | | Merge branch 'release'Brad King2015-03-020-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'fix-crash-on-bad-LANG_STANDARD' into releaseBrad King2015-02-285-1/+17
| |\ \ \
* | \ \ \ Merge topic 'locale-agnostic-findhg'Brad King2015-03-021-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cfb22354 FindHg: Run hg with C locale when querying its version.
| * | | | | FindHg: Run hg with C locale when querying its version.Nils Gladitz2015-02-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LANGUAGE should be ignored when LC_ALL=C. It seems this isn't the case with hg so set both.
* | | | | | Merge topic 'modules-check-ARGC'Brad King2015-03-028-39/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7631fc4 Modules: Check for ARGC before using ARGV#
| * | | | | | Modules: Check for ARGC before using ARGV#Daniele E. Domenichelli2015-02-278-39/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ARGV# could be defined from a parent scope.
* | | | | | | 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.