Commit Graph

51051 Commits

Author SHA1 Message Date
condy 54b409094d cmake-mode.el: Improve help display with reStructuredText mode
Many of the `cmake --help-*` options print `.rst` source documents
with only partial evaluation.  View them in the Emacs `rst-mode`.
2020-12-09 01:21:38 +08:00
Brad King 7775cbdb82 Merge topic 'range-for-avoid-tmp-warning'
99a26babb1 Cleanup: Fix warning about binding to a temporary in range-based for

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5578
2020-12-08 10:21:33 -05:00
Brad King 7e83dc0764 Merge branch 'release-3.19' 2020-12-08 10:20:12 -05:00
Brad King c4feb00aa5 Merge topic 'update_cmp112'
cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5582
2020-12-08 10:20:12 -05:00
Brad King 8a3ecb484f Merge topic 'update_cmp112' into release-3.19
cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5582
2020-12-08 10:20:11 -05:00
Brad King c4fe3d00b5 Merge branch 'release-3.18' 2020-12-08 10:19:13 -05:00
Brad King d506c73a54 Merge branch 'release-3.19' 2020-12-08 10:18:29 -05:00
Brad King 6412d17b4f Merge topic 'FindPython-python2-soabi-suffix-fix'
afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5574
2020-12-08 10:18:29 -05:00
Brad King 61cd587ef3 Merge topic 'FindPython-python2-soabi-suffix-fix' into release-3.19
afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5574
2020-12-08 10:18:28 -05:00
Brad King 1cb30467a3 Merge branch 'release-3.19' 2020-12-08 10:17:34 -05:00
Brad King d00d5ac0cd Merge topic 'correct_ispc_path_computation' into release-3.19
9af93fef11 ISPC: Handle OBJECT sources in different directories
72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5581
2020-12-08 10:17:33 -05:00
Brad King 60d95fe2c2 Merge topic 'correct_ispc_path_computation'
9af93fef11 ISPC: Handle OBJECT sources in different directories
72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5581
2020-12-08 10:17:33 -05:00
Brad King cc14733044 Merge branch 'release-3.19' 2020-12-08 10:16:21 -05:00
Brad King f200ac1304 Merge topic 'remove-partial-intel-compiler-support'
41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification"
f0babb53b3 Revert "Intel: Add Intel Clang compiler identification"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !5583
2020-12-08 10:16:21 -05:00
Brad King 6aa3c3206e Merge topic 'remove-partial-intel-compiler-support' into release-3.19
41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification"
f0babb53b3 Revert "Intel: Add Intel Clang compiler identification"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !5583
2020-12-08 10:16:20 -05:00
Kitware Robot f970f4c301 CMake Nightly Date Stamp 2020-12-08 00:01:11 -05:00
Craig Scott 99a26babb1 Cleanup: Fix warning about binding to a temporary in range-based for 2020-12-08 08:32:30 +11:00
Brad King 41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification"
Revert commit 887f3a88a6 (Intel: Add Intel DPC++ compiler
identification, 2020-09-21, v3.19.0-rc1~124^2).  The compiler has
already been released, and is more usable with CMake by pretending to be
upstream Clang than by identifying it as a compiler for which we have
not implemented support.

Fixes: #21551
2020-12-07 10:46:27 -05:00
Brad King f0babb53b3 Revert "Intel: Add Intel Clang compiler identification"
Revert commit 5c3a93ab88 (Intel: Add Intel Clang compiler
identification, 2020-09-29, v3.19.0-rc1~68^2).  The compiler has already
been released, and is more usable with CMake by pretending to be
upstream Clang than by identifying it as a compiler for which we have
not implemented support.

Issue: #21551
2020-12-07 10:46:22 -05:00
Brad King 41ec2a4fac Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18
Merge-request: !5574
2020-12-07 10:38:23 -05:00
Brad King e94f00dfe3 Merge topic 'get_dir_prop_arg_parsing'
ab1ee5aab8 get_directory_property: Check for empty or missing property name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5577
2020-12-07 10:29:16 -05:00
Brad King 70c9a3e294 Merge topic 'asm_arch' into release-3.19
fcabf4a47e macOS: Add architecture flags only for native ASM dialect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5572
2020-12-07 10:28:18 -05:00
Brad King a0a49349ee Merge branch 'release-3.19' 2020-12-07 10:28:18 -05:00
Brad King afd495decd Merge topic 'asm_arch'
fcabf4a47e macOS: Add architecture flags only for native ASM dialect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5572
2020-12-07 10:28:18 -05:00
Robert Maynard cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt>
Fixes #21559
2020-12-07 09:50:39 -05:00
Robert Maynard 9af93fef11 ISPC: Handle OBJECT sources in different directories 2020-12-07 09:14:54 -05:00
Robert Maynard 72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location 2020-12-07 09:14:13 -05:00
Kitware Robot a37ef1b3d4 CMake Nightly Date Stamp 2020-12-07 00:01:17 -05:00
Kitware Robot 0ab0fe64ac CMake Nightly Date Stamp 2020-12-06 00:01:14 -05:00
Craig Scott ab1ee5aab8 get_directory_property: Check for empty or missing property name
Fixes: #21555
2020-12-06 09:38:12 +11:00
Craig Scott 14576a40ac Merge topic 'remove-WCDH-module'
da7ad7997e WriteCompilerDetectionHeader: Add policy to remove module
541f1410e0 Help: Move Documentation module to list of deprecated modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5573
2020-12-05 06:23:55 -05:00
Brad King da7ad7997e WriteCompilerDetectionHeader: Add policy to remove module
See justification in the policy documentation.

Closes: #17842
2020-12-05 21:57:08 +11:00
Kitware Robot 2e8f8276c7 CMake Nightly Date Stamp 2020-12-05 00:01:12 -05:00
Ben Boeckel afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI
Commit 951640f1f9 (FindPython: manage SOABI for all Python versions,
2020-08-11) extended support for Python2's SOABI variable in order to
support the PyPy interpreter as well. This caused a regression in the
way that the SOABI variable was built up for the CPython interpreter.
This caused the variable to be set to `.so` which ended up causing a
doubling of the resulting `SOABI` variable in the end.

Co-Author: Marc Chevrier <marc.chevrier@gmail.com>
Fixes: #21548
2020-12-04 14:01:27 -05:00
Brad King 541f1410e0 Help: Move Documentation module to list of deprecated modules
The module has been deprecated since commit 306a1ba960
(Modules/Documentation: remove, 2020-04-16, v3.18.0-rc1~290^2).
2020-12-04 10:52:03 -05:00
Brad King 74e1b36579 Merge topic 'test-CMP0118'
43506037d2 Tests: Avoid unnecessary use of toolchain in RunCMake.CMP0118

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5571
2020-12-04 10:50:52 -05:00
Raul Tambre fcabf4a47e macOS: Add architecture flags only for native ASM dialect
ASM dialects like NASM have languages names such as ASM_NASM.
However such ASM dialects don't support the architecture flags, so match only
the full name.

Fixes #21553.
2020-12-04 17:29:14 +02:00
Brad King 486ede8064 Merge topic 'makefiles-compiler-deps-optims'
f395caf498 Makefiles dependencies: enhance robustness of deps parser

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5568
2020-12-04 08:31:58 -05:00
Brad King bb4d70c165 Merge topic 'GoogleTest-disabled-underscore'
dff56b0b97 GoogleTest: Match the full 'DISABLED_' prefix to disable tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !5567
2020-12-04 08:30:40 -05:00
Brad King a6ffbc2170 Merge topic 'test-git-default-branch'
26ec2e2b0c Tests: Update CTest.UpdateGIT test for custom defaultBranch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5565
2020-12-04 08:28:43 -05:00
Brad King 76685b985d Merge topic 'explicit-LANGUAGE-flag'
48aac247e9 Compile with explicit language flag when source LANGUAGE property is set
2e67a75acd Embarcadero: Simplify addition of -P flag for C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5522
2020-12-04 08:27:55 -05:00
Brad King 16c0057a13 Merge branch 'release-3.19' 2020-12-04 08:27:03 -05:00
Brad King 1525385b20 Merge topic 'compiler-id-extra-text' into release-3.19
f25ac39dee CMakeDetermineCompilerId: Tolerate stray text around INFO strings
5cb66f17ca CMakeDetermineCompilerId: Add whitespace to clarify logic
1ee99104f7 CMakeDetermineCompilerId: Filter IAR-AVR format INFO strings earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5570
2020-12-04 08:27:02 -05:00
Brad King 7068189657 Merge topic 'compiler-id-extra-text'
f25ac39dee CMakeDetermineCompilerId: Tolerate stray text around INFO strings
5cb66f17ca CMakeDetermineCompilerId: Add whitespace to clarify logic
1ee99104f7 CMakeDetermineCompilerId: Filter IAR-AVR format INFO strings earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5570
2020-12-04 08:27:02 -05:00
Brad King e15d404cfd Merge branch 'release-3.19' 2020-12-04 08:25:43 -05:00
Brad King 1c06bd1d20 Merge topic 'test-vs-windows-hosts'
dca8800cb5 Tests: Look for Visual Studio only on Windows hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5569
2020-12-04 08:25:43 -05:00
Brad King 22b4bea318 Merge topic 'test-vs-windows-hosts' into release-3.19
dca8800cb5 Tests: Look for Visual Studio only on Windows hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5569
2020-12-04 08:25:42 -05:00
Kitware Robot 26b5a4424a CMake Nightly Date Stamp 2020-12-04 00:01:09 -05:00
Brad King 43506037d2 Tests: Avoid unnecessary use of toolchain in RunCMake.CMP0118
The semantics of the `GENERATED` property do not depend on the kind of
target to which the sources are attached.  Convert the tests to use
custom targets instead of executables so that we do not have to enable
the CXX language and initialize support of its toolchain for every case.
This significantly reduces the time the test takes to run.
2020-12-03 16:32:09 -05:00
Brad King f25ac39dee CMakeDetermineCompilerId: Tolerate stray text around INFO strings
When cross-compiling with Xcode our compiler id test binary may be
compiled with multiple architectures.  The INFO strings should be
identical and therefore de-duplicated.  However, this can be broken by
stray text that happens to sit immediately before or after an INFO
string.  Filter out such text so we can match clean INFO strings.

Fixes: #21526
2020-12-03 14:37:21 -05:00