Commit Graph

44121 Commits

Author SHA1 Message Date
Brad King 01a8b89f29 Merge topic 'eclipse-resource-encoding'
09c1991895 Eclipse: Add option to set the resource encoding

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3525
2019-07-11 08:49:34 -04:00
Craig Scott 24722b7860 Merge topic 'docs-file-GLOB-case-sensitivity'
c65f296960 Help: Mention file(GLOB)'s case-sensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3516
2019-07-11 06:07:26 -04:00
Kitware Robot 7c98e2d1ad CMake Nightly Date Stamp 2019-07-11 00:01:08 -04:00
Brad King f758e8a927 Merge branch 'release-3.15' 2019-07-10 13:21:28 -04:00
Kyle Edwards bb4b394fac Merge topic 'fix/move-more-cpack-internals'
98617f1be0 Refactor: Move CPack internal files to `Internal/CPack/` directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3530
2019-07-10 12:48:12 -04:00
Brad King 86ead0b5a3 CMake 3.15.0-rc4 v3.15.0-rc4 2019-07-10 12:27:14 -04:00
Steve Mokris c65f296960 Help: Mention file(GLOB)'s case-sensitivity
Based on the KWSYS_GLOB_CASE_INDEPENDENT flag in `Source/kwsys/Glob.cxx`.
2019-07-10 09:29:29 -04:00
Brad King 4fc10431f0 Merge topic 'elseif'
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
2019-07-10 09:26:39 -04:00
Brad King fe8f6e362a Merge topic 'clang-test-fixes'
417eb5739a Tests: fix some Clang failures on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3518
2019-07-10 09:25:48 -04:00
Brad King 2161f810d9 Merge topic 'eclipse-init-members'
0a65768068 Eclpise: Fix compiler warnings about uninitialized member variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3524
2019-07-10 09:24:23 -04:00
Brad King 70290a2abf Merge branch 'release-3.15' 2019-07-10 09:22:19 -04:00
Brad King 88bb13827e Merge branch 'release-3.14' 2019-07-10 09:22:02 -04:00
Brad King 96a35a8eed Merge topic 'implicit-includes-cray-hlist'
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
2019-07-10 09:21:24 -04:00
Brad King 29a1a68e90 Merge topic 'cuda-imported-library-device-linking'
8895449648 CUDA: Restore device linking to imported static library targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3526
2019-07-10 09:20:32 -04:00
Brad King 27bd921b38 Merge topic 'emacs/drop-23'
8e1664d108 cmake-mode.el: Drop support for Emacs < 24

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3520
2019-07-10 09:19:36 -04:00
Brad King 98844aaa6f Merge branch 'implicit-includes-cray-hlist' into release-3.15
Merge-request: !3532
2019-07-10 08:57:55 -04:00
Brad King e902a11118 Merge branch 'cuda-imported-library-device-linking' into release-3.15
Merge-request: !3526
2019-07-10 08:57:47 -04:00
Craig Scott 8c7a627f38 Merge branch 'release-3.15' 2019-07-10 20:54:00 +10:00
Craig Scott 844536f681 Merge topic 'docs-message-cmake-gui' into release-3.15
Merge-request: !3523
2019-07-10 20:51:49 +10:00
Craig Scott 3b62d5e677 Merge topic 'docs-message-cmake-gui'
42a9e61056 message() help: Clarify how logs are displayed in various tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3523
2019-07-10 06:44:17 -04:00
Kitware Robot 522b687c89 CMake Nightly Date Stamp 2019-07-10 00:01:08 -04:00
Frank Dana 42a9e61056 message() help: Clarify how logs are displayed in various tools 2019-07-10 09:40:11 +10:00
Craig Scott f7eb765012 Merge topic 'add_cmake_find_use_package_registry'
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
2019-07-09 19:32:54 -04:00
Martin Gerhardy 09c1991895 Eclipse: Add option to set the resource encoding 2019-07-09 13:34:29 -04:00
Brad King 366746bbef Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14
Merge-request: !3532
2019-07-09 13:14:24 -04:00
Brad King 0a7b61269c Merge branch 'backport-implicit-includes-cray-hlist' 2019-07-09 13:13:26 -04:00
Chuck Atkins 98e371f13e Cray: Fix include parsing when the -hlist= flag is present
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.
2019-07-09 13:12:52 -04:00
Zsolt Parragi 417eb5739a Tests: fix some Clang failures on Windows
* 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
2019-07-09 11:30:25 -04:00
Robert Maynard 8895449648 CUDA: Restore device linking to imported static library targets
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.
2019-07-09 11:13:41 -04:00
Martin Gerhardy 0a65768068 Eclpise: Fix compiler warnings about uninitialized member variables 2019-07-09 11:08:50 -04:00
Hong Xu 8e1664d108 cmake-mode.el: Drop support for Emacs < 24
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.
2019-07-09 10:50:19 -04:00
Brad King f374ffb14b Merge topic 'cpack-deb-test'
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
2019-07-09 09:38:40 -04:00
Robert Maynard 447a96f590 vim: Update cmake.vim to include the CMAKE_FIND_USE variables 2019-07-09 09:38:35 -04:00
Robert Maynard 1d00ba9ccf Find: find_package prefers variable CMAKE_FIND_USE_REGISTRY
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`.
2019-07-09 09:38:35 -04:00
Robert Maynard 704e3a2ca8 Find: Correct spelling and layout issues in CMAKE_FIND_USE_ docs 2019-07-09 09:37:55 -04:00
Brad King 0575c81b5d Merge branch 'release-3.15' 2019-07-09 09:37:31 -04:00
Brad King 82bbf976d1 Merge topic 'ccmake-clear-aliases'
b66d61a8d0 cmGlobalGenerator: Do not persist alias targets across configures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3529
2019-07-09 09:36:04 -04:00
Brad King 1b52415cd4 Merge branch 'ccmake-clear-aliases' into release-3.15
Merge-request: !3529
2019-07-09 09:35:01 -04:00
Brad King 45030c5a24 Merge topic 'iar-riscv'
c242187875 IAR: Add support for the RISC-V compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3510
2019-07-09 09:35:01 -04:00
Brad King dd1257e2de Merge branch 'iar-riscv' into release-3.15
Merge-request: !3510
2019-07-09 09:34:42 -04:00
Alex Turbov 98617f1be0 Refactor: Move CPack internal files to Internal/CPack/ directory
Some commits ago all CPack internal `*.cmake` files have been moved
to `Internal/CPack/`. This commit also move some templates
internally used by generators to the same location to make
`Modules/` directory less noisy w/ files the end users don't
need to use/see.
2019-07-09 15:45:03 +03:00
Craig Scott e73893ea32 Merge branch 'release-3.15' 2019-07-09 22:43:43 +10:00
Craig Scott d7673a203c Merge branch 'loglevel-option-case-consistency' into release-3.15
Merge-request: !3521
2019-07-09 22:42:51 +10:00
Craig Scott 2113705c5b Merge topic 'loglevel-option-case-consistency'
14ed40d670 Help: Use consistent levels for cmake --loglevel and message()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3521
2019-07-09 08:40:29 -04:00
Craig Scott f02ea912ac Merge topic 'doc-SKIP_RETURN_CODE-range'
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
2019-07-09 08:37:17 -04:00
Kitware Robot e559a3e990 CMake Nightly Date Stamp 2019-07-09 00:01:09 -04:00
Brad King b66d61a8d0 cmGlobalGenerator: Do not persist alias targets across configures
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
2019-07-08 14:40:46 -04:00
Stefan Andersson c242187875 IAR: Add support for the RISC-V compiler 2019-07-08 13:11:45 -04:00
Brad King 80d9836a35 Merge topic 'autogen_header_extension'
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
2019-07-08 13:00:45 -04:00
Brad King 09fe6664af Merge branch 'release-3.15' 2019-07-08 11:45:10 -04:00