summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-1620-476/+345
| | | | | * upstream-KWSys: KWSys 2017-05-16 (fe1f22ce)
* Merge topic 'xcode-try_compile-scheme'Brad King2017-05-161-4/+6
|\ | | | | | | | | | | | | | | c608000a Xcode: Work around xcodebuild spurious hangs in try_compile b8e707a6 Xcode: Refactor internal decision for scheme generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !850
| * Xcode: Work around xcodebuild spurious hangs in try_compileBrad King2017-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | `xcodebuild` occasionally hangs on some macOS machines (and can be reproduced independent of CMake). It only happens a few times in 1000 runs, but configuration of a large project calls `try_compile` many times and therefore frequently hangs due to this problem. I've been unable to reproduce the hang when using a scheme to build, so always generate a scheme in `try_compile` projects to work around the problem. Issue: #16752
| * Xcode: Refactor internal decision for scheme generationBrad King2017-05-151-4/+5
| | | | | | | | Move the Xcode version check out to wrap everything.
* | Merge topic 'early-config-name'Brad King2017-05-164-13/+4
|\ \ | | | | | | | | | | | | | | | | | | eeb47fbe cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !848
| * | cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on constructionBrad King2017-05-154-13/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the value to our `ConfigName` member on construction to ensure it is available even to code paths that run before `Generate`. We once needed to delay this lookup until `Generate` because the local generators were at one time created before `Configure`. Now they are created at generate time which is late enough to expect `CMAKE_BUILD_TYPE` to be available. Without this, `cmGlobalUnixMakefileGenerator3::WriteConvenienceRules` causes use of `ConfigName` before it is populated which breaks use of source files that depend on the `$<CONFIG>` generator expression. Fixes: #16889
* | Merge topic 'cpackifw-i18n'Brad King2017-05-164-16/+101
|\ \ | | | | | | | | | | | | | | | | | | 72ac7ad9 CPackIFW: Internationalization Support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !748
| * | CPackIFW: Internationalization SupportKonstantin Podsvirov2017-05-124-16/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - DISPLAY_NAME and DESCRIPTION in CPackIFW module now is MULTI_ARGS; - Added internationalization support for DisplayName and Description properties in cmCPackIFWPackage class; - Added documentation to CPackIFW module; - Added release note.
* | | Merge topic 'mingw-w64-compile'Brad King2017-05-161-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9557b403 cmFileCommand: Fix build on mingw-w64 845f5e3c bootstrap: fix build on mingw-w64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !837
| * | | cmFileCommand: Fix build on mingw-w64Aleksey Chernov2017-05-151-0/+4
| | | | | | | | | | | | | | | | Include header needed for `CP_ACP`.
| * | | CMake 3.8.1v3.8.1Brad King2017-05-021-1/+1
| | | |
| * | | Merge branch 'vs2017-sdk-detection' into releaseBrad King2017-04-251-1/+1
| |\ \ \
| * \ \ \ Merge branch 'backport-source_group-TREE-alt-root' into releaseBrad King2017-04-211-16/+44
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-vs2017-guid-braces' into releaseBrad King2017-04-201-7/+2
| |\ \ \ \ \
| * | | | | | CMake 3.8.0v3.8.0Brad King2017-04-101-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-05-161-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'autogen_settings'Brad King2017-05-151-14/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b95fbbe5 Autogen: Add -DWIN32 to definitions list on demand ab39dd11 Autogen: Include moc/uic/rcc binary in settings hash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !836
| * | | | | | Autogen: Add -DWIN32 to definitions list on demandSebastian Holtermann2017-05-131-6/+8
| | | | | | |
| * | | | | | Autogen: Include moc/uic/rcc binary in settings hashSebastian Holtermann2017-05-131-8/+15
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'cpack-components-handle-symlinks'Brad King2017-05-151-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26384068 CPack test symlinks in package 6949b71f CPack unify component/monolithic package symlink handling 3eb0f080 Improved CPack tests error logging Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !841
| * | | | | | CPack unify component/monolithic package symlink handlingDomen Vrankar2017-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non component package generation was recursing through symlinks while monolithic package generation did not. This was causing component archive packages to contain both symlink and a directory with the same name on the same level if symlink contained files which caused errors during extraction of such packages. Closes #16051
* | | | | | | CMake Nightly Date StampKitware Robot2017-05-151-1/+1
|/ / / / / /
* | | | | | CMake Nightly Date StampKitware Robot2017-05-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-05-131-1/+1
|/ / / / /
* | | | | Merge topic 'command-name'Brad King2017-05-12118-796/+267
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1218f59 cmCommand: remove unused methods from interface and all implementations 4ba25a82 cmState: separate builtin and scripted commands a44dab46 cmState: introduce method for adding scripted commands c734c850 CTest: use new methods for builtin commands bd14e464 cmCommands: use new methods for builtin commands 58708405 cmState: introduce methods for adding builtin commands a890ca2f cmakemain: use script role for -P Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !829
| * | | | | cmCommand: remove unused methods from interface and all implementationsDaniel Pfeifer2017-05-11113-571/+7
| | | | | |
| * | | | | cmState: separate builtin and scripted commandsDaniel Pfeifer2017-05-112-70/+52
| | | | | |
| * | | | | cmState: introduce method for adding scripted commandsDaniel Pfeifer2017-05-115-10/+10
| | | | | |
| * | | | | CTest: use new methods for builtin commandsDaniel Pfeifer2017-05-113-27/+26
| | | | | |
| * | | | | cmCommands: use new methods for builtin commandsDaniel Pfeifer2017-05-111-132/+156
| | | | | |
| * | | | | cmState: introduce methods for adding builtin commandsDaniel Pfeifer2017-05-112-0/+28
| | | | | |
| * | | | | cmakemain: use script role for -PDaniel Pfeifer2017-05-111-1/+3
| | | | | |
* | | | | | Merge topic 'add_cuda_cxx14_flag'Brad King2017-05-121-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 036ffe81 CUDA: Add support for the C++14 standard flag. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !830
| * | | | | | CUDA: Add support for the C++14 standard flag.Robert Maynard2017-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA 9 toolkit has announced support for C++14 flag, so lets allow users to use it.
* | | | | | | CMake Nightly Date StampKitware Robot2017-05-121-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'split-sysroot'Brad King2017-05-118-11/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53e89b6a Add options for separate compile and link sysroots Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !819
| * | | | | | Add options for separate compile and link sysrootsBrad King2017-05-098-11/+65
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `CMAKE_SYSROOT_COMPILE` and `CMAKE_SYSROOT_LINK` variables to as operation-specific alternatives to `CMAKE_SYSROOT`. This will be useful for Android NDKs that compile and link with different sysroot values (e.g. `r14` with unified headers). Co-Author: Florent Castelli <florent.castelli@gmail.com>
* | | | | | Merge topic 'cpackifw-access-refactoring'Brad King2017-05-115-558/+583
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 543cf134 CPackIFW: Access refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !820
| * | | | | | CPackIFW: Access refactoringKonstantin Podsvirov2017-05-095-558/+583
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Access members with this->; - Access nested enum values with class name.
* | | | | | Merge topic 'CMP0069-no-warn-try_compile'Brad King2017-05-111-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 469813cc CMP0069: Suppress warning if we are in 'try_compile' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !823
| * | | | | | CMP0069: Suppress warning if we are in 'try_compile'Ruslan Baratov2017-05-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16855
* | | | | | | Merge topic 'dead-code-removal'Brad King2017-05-1112-40/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdd341eb cmFindCommon: remove unused function SetMakefile 67a8d907 cmExecutionStatus: Remove arguments from setters 0c519c70 bootstrap: Remove leftovers from cmBootstrapCommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !821
| * | | | | | | cmFindCommon: remove unused function SetMakefileDaniel Pfeifer2017-05-102-15/+0
| | | | | | | |
| * | | | | | | cmExecutionStatus: Remove arguments from settersDaniel Pfeifer2017-05-0910-25/+32
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The setters are only used to set boolean values. The values are never reset individually.
* | | | | | | CMake Nightly Date StampKitware Robot2017-05-111-1/+1
| | | | | | |
* | | | | | | Merge topic 'vs-project-guid'Brad King2017-05-102-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 776929b3 VS: Fix .vcxproj ProjectGuid element case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !817
| * | | | | | | VS: Fix .vcxproj ProjectGuid element caseBrad King2017-05-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `.vcxproj` file format expects `ProjectGuid`, not `ProjectGUID`. The latter is expected by `.vcproj` files from VS 2008, so this was likely a typo when the VS 2010 generator was first introduced. Fixes: #11968
* | | | | | | | Merge topic 'ninja-windows-command-concat'Brad King2017-05-101-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e0e03d9 Ninja: Fix command concatenation on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !801
| * | | | | | | | Ninja: Fix command concatenation on WindowsBernhard Burgermeister2017-05-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put commands that contain `||` into brackets to avoid early abort of execution by `cmd.exe` because `||` has higher precedence than `&&` in `cmd.exe`. Add test to check for command execution after `||` as part of a parameter and as command separator. Fixes: #16850
* | | | | | | | | Merge topic 'separate-command-registration'Brad King2017-05-1073-301/+106
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44c0b2b7 cmCommand: remove IsScriptable da8faa8c cmState: remove RemoveUnscriptableCommands c3f41af2 cmMakefile: don't check IsScriptable c2c2bbb3 cmake: register fake project commands in -P mode c36d63cd cmake: initialize with Role that controls which commands to register 8986dec0 ctest: remove unused cmake instance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !714