summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'elseif'Brad King2019-07-105-5/+5
|\ | | | | | | | | | | | | | | | | f4ed56ab63 Fix elseif() in place of else() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !3515
| * Fix elseif() in place of else()Artalus2019-07-035-5/+5
| |
* | Merge topic 'clang-test-fixes'Brad King2019-07-104-8/+14
|\ \ | | | | | | | | | | | | | | | | | | 417eb5739a Tests: fix some Clang failures on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3518
| * | Tests: fix some Clang failures on WindowsZsolt Parragi2019-07-094-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Execute MSVCRuntimeLibrary tests for GNU command line mode Clang on Windows using the MSVC ABI * Assembler tests should be executed with the Ninja generator * Assembler tests shouldn't be executed with clang-cl * Fixed a condition in the Preprocess test for clang-cl * Adjusted the conditions on some MSVC specific tests
* | | Merge topic 'eclipse-init-members'Brad King2019-07-101-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0a65768068 Eclpise: Fix compiler warnings about uninitialized member variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3524
| * | | Eclpise: Fix compiler warnings about uninitialized member variablesMartin Gerhardy2019-07-091-0/+2
| | | |
* | | | Merge branch 'release-3.15'Brad King2019-07-100-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'implicit-includes-cray-hlist' into release-3.15Brad King2019-07-108-2/+167
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3532
| * \ \ \ \ Merge branch 'cuda-imported-library-device-linking' into release-3.15Brad King2019-07-101-6/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3526
* | \ \ \ \ \ Merge branch 'release-3.14'Brad King2019-07-100-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14Brad King2019-07-098-2/+167
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3532
* | \ \ \ \ \ \ \ Merge topic 'implicit-includes-cray-hlist'Brad King2019-07-108-2/+167
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a7b61269c Merge branch 'backport-implicit-includes-cray-hlist' 98e371f13e Cray: Fix include parsing when the -hlist= flag is present Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3532
| * | | | | | | | Merge branch 'backport-implicit-includes-cray-hlist'Brad King2019-07-098-2/+167
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Cray: Fix include parsing when the -hlist= flag is presentChuck Atkins2019-07-098-2/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update parsing logic from commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) to handle the quoting behavior caused by the `-hlist=` flag.
* | | | | | | | | Merge topic 'cuda-imported-library-device-linking'Brad King2019-07-101-6/+11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8895449648 CUDA: Restore device linking to imported static library targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3526
| * | | | | | | | CUDA: Restore device linking to imported static library targetsRobert Maynard2019-07-091-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ability was lost in commit 81b4d10d8f (CUDA: More exhaustive checks to determine when to do device linking, 2019-05-09, v3.15.0-rc1~82^2) and needs to be restored to use imported static libraries that have CUDA symbols.
* | | | | | | | | Merge topic 'emacs/drop-23'Brad King2019-07-101-7/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e1664d108 cmake-mode.el: Drop support for Emacs < 24 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3520
| * | | | | | | | | cmake-mode.el: Drop support for Emacs < 24Hong Xu2019-07-091-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cmake--parent-mode` alias exists only for compatibility and breaks Emacs packages and scripts that make use of `prog-mode-hook` because Emacs does not examine whether the parent mode is an alias or not. Remove the alias and require Emacs 24 or higher. Emacs 24 was released in 2012 and this is already 2019, thus the loss to drop support for versions < 24 is negligible.
* | | | | | | | | | Merge branch 'release-3.15'Craig Scott2019-07-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'docs-message-cmake-gui' into release-3.15Craig Scott2019-07-101-6/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3523
* | \ \ \ \ \ \ \ \ \ Merge topic 'docs-message-cmake-gui'Craig Scott2019-07-101-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42a9e61056 message() help: Clarify how logs are displayed in various tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3523
| * | | | | | | | | | message() help: Clarify how logs are displayed in various toolsFrank Dana2019-07-091-6/+6
| |/ / / / / / / / /
* | | | | | | | | | CMake Nightly Date StampKitware Robot2019-07-101-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'add_cmake_find_use_package_registry'Craig Scott2019-07-0919-50/+193
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447a96f590 vim: Update cmake.vim to include the CMAKE_FIND_USE variables 1d00ba9ccf Find: find_package prefers variable CMAKE_FIND_USE_REGISTRY 704e3a2ca8 Find: Correct spelling and layout issues in CMAKE_FIND_USE_ docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3487
| * | | | | | | | | | vim: Update cmake.vim to include the CMAKE_FIND_USE variablesRobert Maynard2019-07-091-0/+6
| | | | | | | | | | |
| * | | | | | | | | | Find: find_package prefers variable CMAKE_FIND_USE_REGISTRYRobert Maynard2019-07-0913-11/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake's find control flags should all have a consistent name. To make this happen we are introducing `CMAKE_FIND_USE_REGISTRY` and deprecating `CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY`.
| * | | | | | | | | | Find: Correct spelling and layout issues in CMAKE_FIND_USE_ docsRobert Maynard2019-07-0911-40/+80
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'cpack-deb-test'Brad King2019-07-0910-101/+62
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7929912b37 CPackComponentsDEB test: simplify error reporting 3d11c63c9c CPackComponentsDEB test: simplify if() arguments 09cf052079 CPackComponentsDEB test: simplify package version generation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr> Merge-request: !3514
| * | | | | | | | | | | CPackComponentsDEB test: simplify error reportingRolf Eike Beer2019-07-054-48/+13
| | | | | | | | | | | |
| * | | | | | | | | | | CPackComponentsDEB test: simplify if() argumentsRolf Eike Beer2019-07-059-43/+43
| | | | | | | | | | | |
| * | | | | | | | | | | CPackComponentsDEB test: simplify package version generationRolf Eike Beer2019-07-059-18/+14
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.15'Brad King2019-07-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'ccmake-clear-aliases' into release-3.15Brad King2019-07-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3529
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'iar-riscv' into release-3.15Brad King2019-07-097-3/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3510
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'ccmake-clear-aliases'Brad King2019-07-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b66d61a8d0 cmGlobalGenerator: Do not persist alias targets across configures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3529
| * | | | | | | | | | | | cmGlobalGenerator: Do not persist alias targets across configuresBrad King2019-07-081-0/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `ccmake` a single global generator instance may be used for multiple configure step runs. The `cmGlobalGenerator::ClearGeneratorMembers` method is supposed to clear global state that is specific to each configure run but forgot to clear alias targets. Fixes: #19457
* | | | | | | | | | | | Merge topic 'iar-riscv'Brad King2019-07-097-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c242187875 IAR: Add support for the RISC-V compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3510
| * | | | | | | | | | | IAR: Add support for the RISC-V compilerStefan Andersson2019-07-087-3/+20
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'release-3.15'Craig Scott2019-07-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'loglevel-option-case-consistency' into release-3.15Craig Scott2019-07-092-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3521
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'loglevel-option-case-consistency'Craig Scott2019-07-092-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14ed40d670 Help: Use consistent levels for cmake --loglevel and message() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3521
| * | | | | | | | | | | Help: Use consistent levels for cmake --loglevel and message()Craig Scott2019-07-082-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message() command requires uppercase log levels. Even though the cmake --loglevel option is not case sensitive, show the supported values as uppercase to match the message() docs as closely as possible, since they are related to the same feature. Also fixes the wrong string being shown for the warning level by cmake --help.
* | | | | | | | | | | Merge topic 'doc-SKIP_RETURN_CODE-range'Craig Scott2019-07-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 365ee32db8 Help: Valid range for test property, SKIP_RETURN_CODE, is 0 to 255, inclusive Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3507
| * | | | | | | | | | | Help: Valid range for test property, SKIP_RETURN_CODE, is 0 to 255, inclusiveStephen Manz2019-07-021-1/+2
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2019-07-091-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'autogen_header_extension'Brad King2019-07-0810-160/+127
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8a310c9d1 cmSystemTools: Remove cmSystemTools::FileFormat method 90b5289c55 cmExtraCodeLiteGenerator: Use cmake::Is*Extension for file type detection e50fa44a35 cmake: Refactor file extension list setup 8214ad442f Tests: Autogen: Extend SameName test with additional header extensions 4a9154537c Autogen: Use cmake::IsHeader/SourceExtension for file type detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3511
| * | | | | | | | | | | | cmSystemTools: Remove cmSystemTools::FileFormat methodSebastian Holtermann2019-07-042-85/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmExtraCodeLiteGenerator: Use cmake::Is*Extension for file type detectionSebastian Holtermann2019-07-041-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmExtraCodeLiteGenerator.cxx use `cmake::Is*Extension` methods instead of `cmSystemTools::GetFileFormat` for file type detection.
| * | | | | | | | | | | | cmake: Refactor file extension list setupSebastian Holtermann2019-07-042-48/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the file extention list setup in cmake.h/cxx and add file extensions lists for Cuda and Fortran.
| * | | | | | | | | | | | Tests: Autogen: Extend SameName test with additional header extensionsSebastian Holtermann2019-07-044-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds additional headers with suffixes ".hh" and uppercase ".H" to the QtAutogen/SameName test.