summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2017-11-031-1/+1
|
* Merge topic 'cross_link_CheckLanguage_enable_language'Craig Scott2017-11-021-1/+2
|\ | | | | | | | | | | | | e2601534 Help: enable_language now documents the CheckLanguage module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1434
| * Help: enable_language now documents the CheckLanguage moduleRobert Maynard2017-10-311-1/+2
| | | | | | | | Resolves #17409
* | Merge topic 'deprecate-policy-old'Brad King2017-11-0247-24/+409
|\ \ | | | | | | | | | | | | | | | | | | | | | a0ec14d3 Add deprecation warnings for policies CMP0054 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1438
| * | Add deprecation warnings for policies CMP0054 and belowBrad King2017-11-0147-24/+409
| | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for some policies to encourage projects to port away from setting policies to OLD.
* | | Merge topic 'update-kwsys'Brad King2017-11-025-25/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7576e9f8 Merge branch 'upstream-KWSys' into update-kwsys 7d3f33e6 KWSys 2017-11-01 (6ffca34c) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1436
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-11-015-25/+50
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-11-01 (6ffca34c)
| | * | | KWSys 2017-11-01 (6ffca34c)KWSys Upstream2017-11-015-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 6ffca34c008f0aac44db0e0c2826673a0e3f6ecf (master). Upstream Shortlog ----------------- Brad King (2): 7a4cca11 Process: Refactor test compile flag addition 90886a99 Process: Fix tests under ubsan Bradley Lowekamp (1): b4507c9c Remove dead code from Configure.h.in Domen Vrankar (1): 9e0b4d1a SystemTools: set default MakeDirectory permissions mode
* | | | | Merge topic 'doc-cmp0037-update'Brad King2017-11-021-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eb39bf2 Help: Document CMP0037 relaxation of test and package targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1437
| * | | | | Help: Document CMP0037 relaxation of test and package targetsBrad King2017-11-011-1/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to account for commit ae5f40696e (CMP0037: Allow test and package targets when features are not enabled, 2017-10-26). Issue: #16062
* | | | | CMake Nightly Date StampKitware Robot2017-11-021-1/+1
|/ / / /
* | | | Merge branch 'release-3.10'Brad King2017-11-010-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | CMake 3.10.0-rc4v3.10.0-rc4Brad King2017-11-011-1/+1
| | | |
* | | | Merge branch 'release-3.10'Brad King2017-11-010-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'mingw-clang-c-compile-features' into release-3.10Brad King2017-11-011-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1435
| * \ \ \ Merge branch 'autogen-moc-predefs-no-moc-options' into release-3.10Brad King2017-10-312-3/+12
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | Merge-request: !1432
* | | | | Merge branch 'release-3.9'Brad King2017-11-010-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9Brad King2017-11-011-3/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1432
* | \ \ \ \ \ Merge topic 'autogen-moc-predefs-no-moc-options'Brad King2017-11-012-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e46f97c Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options 978c98b7 Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command d3caf941 Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple test 96d20a4d Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: EoD <eod@xmw.de> Merge-request: !1432
| * \ \ \ \ \ \ Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-optionsBrad King2017-11-010-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs commandSebastian Holtermann2017-10-311-3/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | Issue: #17418
| * | | | | Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple testSebastian Holtermann2017-10-311-0/+5
| | | | | |
| * | | | | Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs commandSebastian Holtermann2017-10-311-3/+7
| | |/ / / | |/| | | | | | | | | | | | | Closes #17418
* | | | | Merge topic '16780-write-single-xcodeproj'Brad King2017-11-018-0/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4e9ce7c Xcode: Add option to generate only topmost project file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1395
| * | | | | Xcode: Add option to generate only topmost project fileGregor Jasny2017-10-318-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | Closes #16780
* | | | | | Merge topic 'notes_timestamp'Brad King2017-11-011-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0987a399 CTest: fix Time formatting in Notes.xml Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1428
| * | | | | | CTest: fix Time formatting in Notes.xmlZack Galbreath2017-10-311-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes.xml was reporting its timestamp in E-notation. Here's an example of what this looked like: <Time>1.50938e+09</Time> This format is unsuitable for precisely determining when the Notes file was generated. As a result of this commit, the same field now appears as: <Time>1509383044</Time>
* | | | | | Merge topic 'windows-embed-cmake-version'Brad King2017-11-012-0/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b9da05b Windows: Embed version information into CMake binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1412
| * | | | | | Windows: Embed version information into CMake binariesJustin Goshi2017-10-312-0/+47
| | | | | | |
* | | | | | | Merge topic 'mingw-clang-c-compile-features'Brad King2017-11-011-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f86879a0 Record C compile features flags for MinGW Clang on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1435
| * | | | | | Record C compile features flags for MinGW Clang on WindowsBrad King2017-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for C++ by commit v3.5.0-rc1~69^2 (Record compile features for MinGW Clang on Windows, 2016-01-11). Make the same change for C. The `UNIX` condition on Clang C compiler features was already dropped by refactoring in commit v3.9.0-rc1~17^2~4 (Compilers: Port to use default cmake_record_lang_compile_features macros, 2017-05-10). Our documentation already claims support for this combination. This was simply an oversight when support was added for MinGW Clang C++. Issue: #15897 Issue: #15943
* | | | | | | CMake Nightly Date StampKitware Robot2017-11-011-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.10'Brad King2017-10-310-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'autogen-change-rcc-config-suffix' into release-3.10Brad King2017-10-301-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1425
* | \ \ \ \ \ \ Merge topic 'autogen-change-rcc-config-suffix'Brad King2017-10-311-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bda0875a Autogen: Make rcc output file suffix static (instead of pseudo-random) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Taylor Braun-Jones <taylor@braun-jones.org> Merge-request: !1425
| * | | | | | | Autogen: Make rcc output file suffix static (instead of pseudo-random)Sebastian Holtermann2017-10-301-2/+2
| |/ / / / / /
* | | | | | | Merge topic 'update-vim-syntax'Brad King2017-10-314-22/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a6cdbae update vim-syntax to latest cmake-commit 11225ec6 vim-cmake-syntax 2017-10-31 (a8a846f0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1431
| * \ \ \ \ \ \ update vim-syntax to latest cmake-commitPatrick Boettcher2017-10-314-22/+33
| |\ \ \ \ \ \ \
| | * | | | | | | vim-cmake-syntax 2017-10-31 (a8a846f0)vim-cmake-syntax upstream2017-10-314-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit a8a846f067e8d8bf565c27a1943017f9fce5a5b7 (master). Upstream Shortlog ----------------- Dimitri Merejkowsky (4): 4e3a59ce Small cleanups asked by Bram ecff9926 Add Dimitri as maintainer for the indent file too c6a2f171 indent/cmake.vim: save and restore cpo option f2a8a21b cmake indent: replace &sw by shiftwidth() Patrick Boettcher (2): 9e9ad02e do not force expandtabs for all cmake-users a8a846f0 update keywords to 3.10.20171031-gfd2e6
* | | | | | | | | Merge topic 'cmp0037-conditional-targets'Brad King2017-10-3141-145/+341
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae5f4069 CMP0037: Allow test and package targets when features are not enabled 409527a0 CMP0037: De-duplicate check and message generation a2611d81 Tests: Add RunCMake.CMP0037 case for WARN on reserved targets 103501c4 Tests: Do not enable languages in all cases of RunCMake.CMP0037 2d0b3e6e cmGlobalGenerator: Refactor test and package target conditions Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1417
| * | | | | | | | | CMP0037: Allow test and package targets when features are not enabledBrad King2017-10-3026-5/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMake will not generate a test, package, or package_source target, allow projects to create their own targets with these names. Fixes: #16062
| * | | | | | | | | CMP0037: De-duplicate check and message generationBrad King2017-10-305-91/+48
| | | | | | | | | |
| * | | | | | | | | Tests: Add RunCMake.CMP0037 case for WARN on reserved targetsBrad King2017-10-263-0/+41
| | | | | | | | | |
| * | | | | | | | | Tests: Do not enable languages in all cases of RunCMake.CMP0037Brad King2017-10-268-8/+8
| | | | | | | | | |
| * | | | | | | | | cmGlobalGenerator: Refactor test and package target conditionsBrad King2017-10-261-42/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `AddGlobalTarget_{Test,Package,PackageSource}`, check conditions up front and return early if the targets are not needed. This reduces the indentation of the main logic.
* | | | | | | | | | Merge topic '15468-xcode-hide-zero-check-source-group'Brad King2017-10-311-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89add9b3 Xcode: Do not create ZERO_CHECK source group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1429
| * | | | | | | | | | Xcode: Do not create ZERO_CHECK source groupGregor Jasny2017-10-301-2/+6
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15468
* | | | | | | | | | Merge topic 'vs-hlsl-opt-dbg'Brad King2017-10-315-0/+42
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 025221df VS: Add source file property to set hlsl debug and optimization flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1420
| * | | | | | | | | | VS: Add source file property to set hlsl debug and optimization flagsJeremiah van Oosten2017-10-305-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `VS_SHADER_DISABLE_OPTIMIZATIONS` and `VS_SHADER_ENABLE_DEBUG` source file properties to control these settings on `.hlsl` files in the VS generator. Fixes: #17406
* | | | | | | | | | | Merge topic 'minifixes'Brad King2017-10-312-8/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a4a61d9 cmForEachCommand: prevent leakage 52680d80 cm_codecvt: cleanup superfluous semicolons Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1402