Commit Graph

50841 Commits

Author SHA1 Message Date
Kitware Robot
39ee591a2f CMake Nightly Date Stamp 2020-11-24 00:01:08 -05:00
Brad King
ee53b1af19 Merge topic 'doc-removed-UseJava-modules'
51ee82ddc6 Help: Restore documentation placeholder for removed modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5523
2020-11-23 11:25:31 -05:00
Brad King
61d3a4317f Merge branch 'release-3.19' 2020-11-23 11:24:22 -05:00
Brad King
4e4ced79fd Merge topic 'ctest_custom_versions'
6e7625989c Help: Fix `.. versionadded` directives for CTEST_CUSTOM_* variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5524
2020-11-23 11:24:22 -05:00
Brad King
d1b6879ece Merge topic 'ctest_custom_versions' into release-3.19
6e7625989c Help: Fix `.. versionadded` directives for CTEST_CUSTOM_* variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5524
2020-11-23 11:24:22 -05:00
Brad King
13a1531e66 Merge branch 'release-3.19' 2020-11-23 11:23:02 -05:00
Brad King
92d21eae65 Merge topic 'cuda_11' into release-3.19
046e454fdd CUDA: Error if can't determine toolkit library root
440dc98b07 CUDA: Clang CUDA 11.1 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5525
2020-11-23 11:23:02 -05:00
Brad King
8832b695e0 Merge topic 'cuda_11'
046e454fdd CUDA: Error if can't determine toolkit library root
440dc98b07 CUDA: Clang CUDA 11.1 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5525
2020-11-23 11:23:02 -05:00
Brad King
20bb6f24d1 Merge topic 'FindGTest-revert-no-release' into release-3.19
64dc4efc51 FindGTest: Revert "Allow either "Debug" or "Release" configurations."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5520
2020-11-23 11:21:53 -05:00
Brad King
9ce530eac7 Merge branch 'release-3.19' 2020-11-23 11:21:53 -05:00
Brad King
0a5dd563b7 Merge topic 'FindGTest-revert-no-release'
3bc549540e Merge branch 'master' into FindGTest-revert-no-release
64dc4efc51 FindGTest: Revert "Allow either "Debug" or "Release" configurations."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5520
2020-11-23 11:21:53 -05:00
Brad King
b7088c1512 Merge branch 'release-3.19' 2020-11-23 11:19:59 -05:00
Brad King
c178fad186 Merge topic 'fix-compile-db-crash'
67e2130c96 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5521
2020-11-23 11:19:59 -05:00
Brad King
ed049d1678 Merge topic 'fix-compile-db-crash' into release-3.19
67e2130c96 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5521
2020-11-23 11:19:58 -05:00
Kitware Robot
732cc38459 CMake Nightly Date Stamp 2020-11-23 00:01:15 -05:00
Raul Tambre
046e454fdd CUDA: Error if can't determine toolkit library root
Finding the toolkit is required for Clang and is assumed to have been correctly
found by FindCUDAToolkit if the CUDA language is found.
Error out early with an useful error instead of failing later on due to the
path not being set.
2020-11-22 11:30:01 +02:00
Raul Tambre
440dc98b07 CUDA: Clang CUDA 11.1 support
version.txt is gone from CUDA 11.1 installations, but the rest is the same.
Instead of looking for version.txt look for <CUDA path>/nvvm/libdevice, which
is the main thing that Clang requires (though it also checks for the existence
of bin and include).

Fixes #21353.
2020-11-22 11:30:01 +02:00
Kitware Robot
4c67c0d28f CMake Nightly Date Stamp 2020-11-22 00:01:05 -05:00
Nikita Nemkin
6e7625989c Help: Fix .. versionadded directives for CTEST_CUSTOM_* variables
CTEST_CUSTOM_* variables predate 3.0, but the docs were only added in 3.4.

Issue: #19715
2020-11-22 03:15:45 +05:00
Kitware Robot
17a37a83b0 CMake Nightly Date Stamp 2020-11-21 00:01:11 -05:00
Brad King
51ee82ddc6 Help: Restore documentation placeholder for removed modules
In commit cb28d9af1f (UseJava: Move helper scripts to subdirectory,
2020-11-12) we removed modules that were not meant to be documented
publicly.  In order to keep links from older versions on `cmake.org` to
the "latest" documentation working for those modules, add placeholder
documents describing the change.
2020-11-20 12:30:14 -05:00
Brad King
3bc549540e Merge branch 'master' into FindGTest-revert-no-release 2020-11-20 10:15:53 -05:00
Brad King
bf241bcc1e Merge topic 'improve_cmakes_error_handling_of_bad_parameters'
7302a23a1f cmake: Simplify -W recognition of no- and error= prefixes
98290782b6 cmake: redesign command-line argument parsing
d800c26ce9 cmake: Fix processing of -Wno-error= flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !5458
2020-11-20 10:09:03 -05:00
Brad King
a65088659d Merge branch 'release-3.19' 2020-11-20 10:05:12 -05:00
Brad King
4549027a09 Merge topic 'revert-explicit-LANGUAGE-flag' into release-3.19
30aa715fac Revert "specify language flag when source LANGUAGE property is set"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5519
2020-11-20 10:05:11 -05:00
Brad King
60a131efd5 Merge topic 'revert-explicit-LANGUAGE-flag'
30aa715fac Revert "specify language flag when source LANGUAGE property is set"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5519
2020-11-20 10:05:11 -05:00
Brad King
67e2130c96 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule
Fixes: #21471
2020-11-20 09:45:14 -05:00
Brad King
64dc4efc51 FindGTest: Revert "Allow either "Debug" or "Release" configurations."
Revert commit a064b18f85 (FindGTest: Allow either "Debug" or "Release"
configurations., 2020-06-29, v3.19.0-rc1~584^2).  If both configurations
are found then `GTEST_LIBRARY` is populated in a way that breaks
`__gtest_determine_library_type`, and the imported target is not
created correctly.

Fixes: #21473
Issue: #17799
2020-11-20 09:31:54 -05:00
Kitware Robot
8dc3ef670d CMake Nightly Date Stamp 2020-11-20 00:01:08 -05:00
Brad King
30aa715fac Revert "specify language flag when source LANGUAGE property is set"
Revert commit 74b1c9fc8e (Explicitly specify language flag when source
LANGUAGE property is set, 2020-06-01, v3.19.0-rc1~722^2) and the lookup
tables from its two immediate ancestors.  The purpose of that change was
to convert an explicit `LANGUAGE` source file property into an explicit
language specification compiler flag like `-x c`.  This seems reasonable
since the property is documented as meaning "indicate what programming
language the source file is".  It is also needed to help compilers deal
with non-standard source file extensions they don't recognize.

However, some projects have been setting `LANGUAGE C` on `.S` assembler
source files to mean "use the C compiler".  Passing `-x c` for them
breaks the build because the `.S` sources are not written in C.  These
projects should be updated to use `enable_language(ASM)`, for which
CMake often chooses the C compiler as the assembler when using
toolchains that support it (which would have to be the case for projects
using the approach).

Revert the change for now to preserve the old behavior for such projects.
We can re-introduce it with a policy in a future version of CMake.

Fixes: #21469
Issue: #14516, #20716
2020-11-19 17:06:03 -05:00
Brad King
0cab7dfa3b Merge topic 'elisp'
364a40025c cmake.el: enable view-mode when lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jostein Kjønigsen <jostein@kjonigsen.net>
Merge-request: !5517
2020-11-19 10:44:43 -05:00
Brad King
f800e28a9c Merge topic 'scandep-p1689r3'
2cb1d77c58 scandep: update format to P1689 R3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5515
2020-11-19 10:43:26 -05:00
Brad King
7302a23a1f cmake: Simplify -W recognition of no- and error= prefixes 2020-11-19 08:53:58 -05:00
Robert Maynard
98290782b6 cmake: redesign command-line argument parsing
Make handling more consistent:

   "-S" -> invalid
   "-S/path/to/source" -> valid
   "-S /path/to/source" -> valid
   "-S=/path/to/source" -> now valid

   "-D" -> invalid
   "-DStr" -> valid
   "-D Str" -> valid
   "-D=Str" -> now valid

   "--log-level=" -> invalid
   "--log-level" -> invalid
   "--log-level=2" -> valid
   "--log-level 2" -> now valid
2020-11-19 08:53:58 -05:00
Kitware Robot
785552c754 CMake Nightly Date Stamp 2020-11-19 00:01:24 -05:00
Brad King
1d1d78bbe1 Merge topic 'ci-updates' into release-3.19
ec5223666b gitlab-ci: update macOS jobs to use Xcode 12.0
fa0c02e9df ci: update to use CMake 3.19.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5516
2020-11-18 13:36:01 -05:00
Brad King
454386d742 Merge branch 'release-3.19' 2020-11-18 13:36:01 -05:00
Brad King
f5f7bf122f Merge topic 'ci-updates'
ec5223666b gitlab-ci: update macOS jobs to use Xcode 12.0
fa0c02e9df ci: update to use CMake 3.19.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5516
2020-11-18 13:36:01 -05:00
condy
364a40025c cmake.el: enable view-mode when lookup 2020-11-19 01:11:36 +08:00
Brad King
ec5223666b gitlab-ci: update macOS jobs to use Xcode 12.0 2020-11-18 11:49:55 -05:00
Brad King
fa0c02e9df ci: update to use CMake 3.19.0 2020-11-18 11:48:16 -05:00
Brad King
2cb1d77c58 scandep: update format to P1689 R3
The `work-directory` field has been moved into individual rules since
each one may correspond to a different compiler invocation and therefore
a different work directory.

Support for arbitrary binary paths has been removed for simplicity.
We now assume paths have a valid UTF-8 round-trip representation.
2020-11-18 10:42:57 -05:00
Brad King
6d098535a5 Merge branch 'release-3.19' 2020-11-18 08:47:54 -05:00
Brad King
222bf361e4 CMake 3.19.0 v3.19.0 2020-11-18 07:46:23 -05:00
Brad King
83b7e5c1da Merge branch 'release-3.19' 2020-11-18 07:41:15 -05:00
Brad King
b9239c08ed Merge branch 'release-3.18' into release-3.19 2020-11-18 07:40:58 -05:00
Brad King
04b6de78a7 Merge topic 'ninja-fortran-ddi-format'
f3eed2c49d cmGlobalNinjaGenerator: use P1689 dependency file format for Fortran
a02c4ccabc cmScanDepFormat: add reader and writer for the format from P1689R2
fa18069ebd Ninja: Exclude unused dyndep features during CMake bootstrap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5485
2020-11-18 07:32:21 -05:00
Brad King
513fff7508 Merge topic 'rename_cuda_memcheck' into release-3.19
fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5514
2020-11-18 07:29:54 -05:00
Brad King
ac4deef271 Merge branch 'release-3.19' 2020-11-18 07:29:54 -05:00
Brad King
c8b2331e8b Merge topic 'rename_cuda_memcheck'
fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5514
2020-11-18 07:29:54 -05:00