Commit Graph

54681 Commits

Author SHA1 Message Date
Brad King
84673a8243 Merge topic 'xcode-dead-code'
b8a2ce0484 cmGlobalXCodeGenerator: Remove dead buildsystem version check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6568
2021-09-29 09:57:00 -04:00
Brad King
a074204986 Merge topic 'xcode-generation-support-inl-files'
16ea0e57f7 Xcode: Treat .inl files as C++ header files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6563
2021-09-29 09:56:02 -04:00
Brad King
487b011574 Merge topic 'GetPrerequisites-objdump-exe'
403f343082 GetPrerequisites: Support CMAKE_OBJDUMP with .exe extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6566
2021-09-29 09:52:16 -04:00
Brad King
9b1fc61722 Merge topic 'nasm-defines-fix'
9b94f95bed ASM_NASM: Pass preprocessor definitions to assembler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6567
2021-09-29 09:51:20 -04:00
Kitware Robot
700f76299c CMake Nightly Date Stamp 2021-09-29 00:01:13 -04:00
Jake Turner
16ea0e57f7 Xcode: Treat .inl files as C++ header files
Generate the `explicitFileType` as `sourcecode.cpp.h` instead of just
`sourcecode`.  This enables syntax highlighting in Xcode.
2021-09-28 10:49:04 -04:00
Brad King
b8a2ce0484 cmGlobalXCodeGenerator: Remove dead buildsystem version check
In commit 8d5f4c4db9 (Xcode: Switch to the "new build system" for Xcode
12 and above, 2020-09-14, v3.19.0-rc1~143^2~7) we accidentally added
code in an `else` block that under the opposite condition by which
the block can be entered.  Remove it.

Fixes: #22681
2021-09-28 10:42:48 -04:00
Wirtos_new
9b94f95bed ASM_NASM: Pass preprocessor definitions to assembler
Add the `<DEFINES>` placeholder to `CMAKE_ASM_NASM_COMPILE_OBJECT`.

Fixes: #22694
2021-09-28 10:14:50 -04:00
Daniel Schlegel
403f343082 GetPrerequisites: Support CMAKE_OBJDUMP with .exe extension
When running `fixup_bundle` in a MSYS environment it fails because
`gp_tool` resolves to `objdump.exe` and not just `objdump`.

Fixes: #22381
2021-09-28 10:11:00 -04:00
Brad King
09dd52c9d2 Merge topic 'tutorial_update_step_8'
f55a02a26e Tutorial: Enhance CTestConfig info in Step 8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6565
2021-09-28 09:56:14 -04:00
Kitware Robot
966d9b3967 CMake Nightly Date Stamp 2021-09-28 00:01:17 -04:00
Brad King
71c50f0019 Merge branch 'release-3.21' 2021-09-27 13:48:57 -04:00
Brad King
a21d5455c0 Merge topic 'autogen-dep-on-imported-implib-only-target'
895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets
354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6558
2021-09-27 13:48:57 -04:00
Brad King
12b999e66a Merge topic 'autogen-dep-on-imported-implib-only-target' into release-3.21
895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets
354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6558
2021-09-27 13:48:56 -04:00
Brad King
16b54616ca Merge topic 'update-curl'
5b117bddd0 Merge branch 'upstream-curl' into update-curl
c4f76b28dc curl 2021-09-22 (c7aef0a9)
71ea2d607d curl: Update script to get curl 7.79.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6560
2021-09-27 13:48:03 -04:00
Brad King
6c4ebcbf40 Merge topic 'tutorial_update_stage_2'
68e0f72744 Tutorial: Describe placement of add_subdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6559
2021-09-27 13:46:58 -04:00
Brad King
8dc72232d9 Merge topic 'iar-lang-spec-detection'
a9073db736 IAR: update language specification detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6458
2021-09-27 13:46:03 -04:00
Joseph Snyder
f55a02a26e Tutorial: Enhance CTestConfig info in Step 8
Add a copy of the CTestConfig.cmake from Step 9 into the directory for
Step 8.

Expand the information about the contents of the CTestConfig file and
write a brief explanation of where on CDash to acquire the CTestConfig
file for a specific project.

CMake Issue: #22663
2021-09-27 10:11:17 -04:00
Kitware Robot
b0c2aeaab4 CMake Nightly Date Stamp 2021-09-27 00:01:25 -04:00
Kitware Robot
1edc9e8887 CMake Nightly Date Stamp 2021-09-26 00:01:28 -04:00
Craig Scott
d277d797de Merge topic 'doc-find_package-restructure'
84e02be51c Help: Restructure the find_package() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6542
2021-09-25 03:39:33 -04:00
Kitware Robot
c42a5a6d93 CMake Nightly Date Stamp 2021-09-25 00:01:17 -04:00
Ben Boeckel
895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets
Instead of using the target name directly (which ends up in the `Ninja`
generators querying for the `LOCATION` parameter), wrap up the target
name in a `$<TARGET_LINKER_FILE:>` to avoid the query for the unset
property.
2021-09-24 11:29:54 -04:00
Ben Boeckel
354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior
On Windows, imported shared libraries which only have an
`IMPORTED_IMPLIB` set fail if they are depended upon by a target using
automoc. Add a test for the behavior of depending upon all imported
target types from an automoc-using target.
2021-09-24 11:29:54 -04:00
Brad King
5b117bddd0 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2021-09-22 (c7aef0a9)
2021-09-24 10:04:49 -04:00
Curl Upstream
c4f76b28dc curl 2021-09-22 (c7aef0a9)
Code extracted from:

    https://github.com/curl/curl.git

at commit c7aef0a945f9b6fb6d3f91716a21dfe2f4ea635f (curl-7_79_1).
2021-09-24 10:03:55 -04:00
Brad King
71ea2d607d curl: Update script to get curl 7.79.1 2021-09-24 10:03:35 -04:00
Brad King
2974ea7c3e Merge topic 'irsl-intel-variants'
956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6557
2021-09-24 09:16:10 -04:00
Brad King
4e23745093 Merge topic 'mpi-cross'
0723b2c935 MPI: Add fallback detection code for MPI when cross compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6537
2021-09-24 09:15:17 -04:00
Brad King
6e6ad6e02e Merge branch 'release-3.21' 2021-09-24 09:14:20 -04:00
Brad King
1f8b4afbce Merge topic 'FindMatlab-r2021b'
a013404f43 FindMatlab: Add R2021b => 9.11 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6556
2021-09-24 09:14:20 -04:00
Brad King
afd4d25280 Merge topic 'FindMatlab-r2021b' into release-3.21
a013404f43 FindMatlab: Add R2021b => 9.11 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6556
2021-09-24 09:14:19 -04:00
Joseph Snyder
68e0f72744 Tutorial: Describe placement of add_subdirectory
Clarify that the process of making a target optional in the second step
of the tutorial is further steps to the work done before, not
a separate addition to the file.

Do this by ensuring that the paragraph which describes the work done
mentions the placement and use of the previous command.
This is done to avoid duplication of the add_subdirectory call.

CMake Issue: #22663
2021-09-24 08:59:23 -04:00
Kitware Robot
d2541062bd CMake Nightly Date Stamp 2021-09-24 00:01:17 -04:00
Felipe Torrezan
a9073db736 IAR: update language specification detection 2021-09-23 22:09:57 +02:00
Brad King
956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler
The oneAPI icx/ifx compilers are under `.../windows/bin`.
The classic icl/ifort compilers are under `.../windows/bin/intel64`.
Add paths to the redist directory relative to both locations.

Fixes: #22673
2021-09-23 11:45:35 -04:00
Michael Hirsch
a013404f43 FindMatlab: Add R2021b => 9.11 version
R2021b released 09/22/2021.
2021-09-23 10:41:20 -04:00
Brad King
c5b91304ed Merge topic 'iar-asm-deduplication'
b1727b8a7e IAR: ASM module code deduplication

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6553
2021-09-23 10:36:27 -04:00
Felipe Torrezan
b1727b8a7e IAR: ASM module code deduplication 2021-09-23 10:35:06 -04:00
Brad King
e83a5f9cac Merge topic 'vs2008-no-pch-flag'
a2b782bbc1 VS: Map /Y- flag to not use precompiled headers with VS 2008

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6548
2021-09-23 10:33:19 -04:00
Brad King
272d23579f Merge topic 'matlab_versions_natural_sort'
2f43ba5073 FindMatlab: Sort available Matlab versions using natural comparison.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6555
2021-09-23 10:32:27 -04:00
Brad King
2452067fb2 Merge topic 'iar-rl78-xlink'
8954f93543 IAR: emit fatal message for RL78 XLINK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6552
2021-09-23 10:31:25 -04:00
Brad King
54188c0e8c Merge topic 'iar-riscv-binutils'
7c3684b356 IAR: fix assembler detection for RISC-V

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6551
2021-09-23 10:30:26 -04:00
Brad King
3f46b94e0a Merge topic 'IAR-executable-suffix'
9254e7ddf2 IAR: Use same executable suffix as try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6546
2021-09-23 10:29:24 -04:00
Craig Scott
84e02be51c Help: Restructure the find_package() docs
The explanation of the basic and full signatures was interwoven tightly
with that of the Module and Config search modes. Config mode is
supported by both signatures, which made the structure of the
command documentation a bit confusing.

Add a section at the start which unambiguously describes the two
modes, including the fallback functionality between them. Move the
text about this out of the basic signature section, leaving just a
description of the basic syntax with a note that it is supported by both
search modes. This makes the basic signature section more focused.

Drop the Module and Config mode parts of the titles for the basic and
full signature sections. Those are now more precisely covered by the
new opening section, so the Basic Signature and Full Signature sections
are now clearer in what they cover.

Swap the order of the Search Procedure and Version Selection sections
to improve the logical flow. Also add  "Config Mode" to their titles to
make it clearer what they apply to. Add a note at the start of both
sections to highlight their relationship to the basic and full signatures.
2021-09-23 21:56:33 +10:00
Kitware Robot
efed2f8706 CMake Nightly Date Stamp 2021-09-23 00:01:16 -04:00
Luigi Fiorentini
a2b782bbc1 VS: Map /Y- flag to not use precompiled headers with VS 2008 2021-09-22 09:19:47 -04:00
Brad King
286bdad531 Merge topic 'rename-cmProp-in-cmValue'
59ad7a1c24 Move helpers functions from cmStringAlgorithms.h to cmValue.h
edf67dd039 cmValue: add IsInternallyOn methods
cc56dc7468 Rename cmProp in cmValue

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6554
2021-09-22 09:10:39 -04:00
Craig Scott
b1745dcbca Merge topic 'doc-build-config'
b8d10c27d1 Help: Restructure build type docs and clarify case sensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6516
2021-09-22 08:20:08 -04:00
Vincent Newsum
2f43ba5073 FindMatlab: Sort available Matlab versions using natural comparison.
On Windows, when FindMatlab.cmake searches the registry for installed Matlab versions, it sorts these versions alphabetically.
Since Matlab 2021a (version 9.10) came out this became a problem as now version 9.10 is placed after 9.1 instead of after a higher version less than 9.10.
The result is that FindMatlab doesn't return the highest version by default.
This fix uses the natural sort comparison which was introduced in CMake 3.18.
2021-09-22 09:43:56 +02:00