mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,524 Commits 2 Branches 401 Tags
28f4686fc61aebcda5cd9007afeeac6879bca44d
Commit Graph

53524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 9548b059c0 ci: add clang-11 to cuda10.2 base image 2021-06-16 14:18:09 -04:00
Brad King ab3830401f Merge branch 'backport-3.20-vs-map-external-warnings' 2021-06-16 13:34:48 -04:00
Brad King e4ca525d84 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 
Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*'
flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the
`ExternalWarningLevel` element.  VS 16.9 does not support that element,
but its `cl` compiler does support the `/external:W*` flags.  Filter out
the flag table entry on older VS versions.

Fixes: #22308
 2021-06-16 13:24:32 -04:00
Brad King aabc3ca47d cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method 
Port from `cmGlobalVisualStudioVersionedGenerator`.
 2021-06-16 13:22:32 -04:00
Brad King e66a7fe07b cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace 2021-06-16 13:20:44 -04:00
Brad King 947f0c8b81 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 
Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*'
flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the
`ExternalWarningLevel` element.  VS 16.9 does not support that element,
but its `cl` compiler does support the `/external:W*` flags.  Filter out
the flag table entry on older VS versions.

Fixes: #22308
 2021-06-16 11:08:15 -04:00
Brad King e59a208b69 cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method 
Port from `cmGlobalVisualStudioVersionedGenerator`.
 2021-06-16 10:57:15 -04:00
Brad King d6d4af0ec3 cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace 2021-06-16 10:57:14 -04:00
Kyle Edwards c017098d4d CMake: Allow override of unexpected non-flow-control commands 
Fixes: #22310
 2021-06-16 10:39:39 -04:00
Brad King 4371a25d1f Merge topic 'FindLATEX' 
d3274e0a6f FindLATEX: Search user-local MiKTeX locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6230
 2021-06-16 08:28:39 -04:00
Steven A White d3274e0a6f FindLATEX: Search user-local MiKTeX locations 
I've noticed the default installer for MikTex does not prompt for
escalation.  So, many installations I find do not have registry entries.
This should cover finding it in the current defaults.
 2021-06-16 08:25:34 -04:00
Brad King a9fbc4959a Merge topic 'scandep-format' 
a35d121276 Ninja: Populate P1689R4 compiled-module-path field for Fortran
10b2e53469 cmScanDepFormat: Remove Fortran-specific compiled-module-path logic
2b9890e9b9 cmScanDepFormat: Avoid writing lookup-method with default value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6228
 2021-06-16 08:19:28 -04:00
Brad King 89a1aa8412 Merge branch 'release-3.20' 2021-06-16 08:14:42 -04:00
Brad King 7d6a71ac85 Merge topic 'ci-xcode-12.5' 
9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6229
 2021-06-16 08:14:42 -04:00
Brad King a9ff600a50 Merge topic 'ci-xcode-12.5' into release-3.20 
9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6229
 2021-06-16 08:14:41 -04:00
Kitware Robot 24399a8d84 CMake Nightly Date Stamp 2021-06-16 00:01:09 -04:00
Brad King 9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5 2021-06-15 15:42:08 -04:00
Brad King a35d121276 Ninja: Populate P1689R4 compiled-module-path field for Fortran 
When scanning Fortran dependencies, we know the file path at which a
provided module file is written.  Store it in the `compiled-module-path`
field as specified by P1689R4.  Our collator in `cmake_ninja_dyndep` no
longer needs to assume that the module file path can be derived from the
logical module name.  In the future, the Fortran dependency scanning may
be done by the compiler itself, in which case it will provide the value
of `compiled-module-path`.
 2021-06-15 09:11:06 -04:00
Brad King 10b2e53469 cmScanDepFormat: Remove Fortran-specific compiled-module-path logic 
Read and write the `compiled-module-path` field only when explicitly
known.  Move the assumption that the `compiled-module-path` can be
derived from the logical module name from the scandep parser to the
`cmake_ninja_dyndep` helper.
 2021-06-15 09:09:28 -04:00
Brad King 2b9890e9b9 cmScanDepFormat: Avoid writing lookup-method with default value 2021-06-15 08:48:05 -04:00
Brad King 998fa490f4 Merge topic 'ninja-scandep-preprocessor-output' 
312ced6547 cmNinjaTargetGenerator: Fix scan rule PREPROCESSED_SOURCE placeholder
1dd9c4ab6f cmNinjaTargetGenerator: Clarify GetScanBuildStatement condition
d94b23885a cmNinjaTargetGenerator: Simplify scan rule response file selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6227
 2021-06-15 08:40:29 -04:00
Brad King 9a31298ed6 Merge topic 'CMakeDependentOption' 
0665d9092e CMakeDependentOption: Allow parentheses in the depends string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6225
 2021-06-15 08:39:37 -04:00
Kitware Robot b302dd776c CMake Nightly Date Stamp 2021-06-15 00:01:25 -04:00
Brad King 312ced6547 cmNinjaTargetGenerator: Fix scan rule PREPROCESSED_SOURCE placeholder 
When running the module dependencies scan tool for for a language that
does not compile the preprocessed output, we do not actually put the
preprocessed output in the build graph.  However, the value of
`CMAKE_EXPERIMENTAL_<LANG>_SCANDEP_SOURCE` may reference the placeholder
for the preprocessed source.  Populate the placeholder to keep the file
out of the way.  In particular, do not clobber the `.ddi` file.
 2021-06-14 15:15:39 -04:00
Brad King 1dd9c4ab6f cmNinjaTargetGenerator: Clarify GetScanBuildStatement condition 
Use the `compilePP` variable directly rather than relying on callers
to make `compilePP == !ppFileName.empty()`.
 2021-06-14 15:11:20 -04:00
Brad King d94b23885a cmNinjaTargetGenerator: Simplify scan rule response file selection 
Since commit 33a8e0bb09 (cmNinjaTargetGenerator: Simplify scan rule
depfile selection, 2020-11-06, v3.20.0-rc1~516^2~1), the `$out` of the
scan rule always matches our `.rsp` file selection, so use `$out.rsp`.
 2021-06-14 15:06:34 -04:00
Daniel Schürmann 0665d9092e CMakeDependentOption: Allow parentheses in the depends string 
`if()` takes the condition as a list of arguments.
Parentheses need to be separated as well.

Fixes: #22303
 2021-06-14 13:45:49 -04:00
Brad King 046aee0441 Help: Consolidate 3.21 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.21.rst`.
 2021-06-14 12:14:28 -04:00
Brad King 0d3ddb1704 Merge branch 'release-3.20' 2021-06-14 11:59:23 -04:00
Brad King b61fe6a831 CMake 3.20.4 v3.20.4 2021-06-14 11:05:49 -04:00
Brad King 6b218d2e26 Merge topic 'objc-std-17-23' 
e8dc95ae1e ObjectiveC: Add C17 and C23 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6219
 2021-06-14 09:49:22 -04:00
Brad King 13b40c1ea2 Merge topic 'FindBLAS-LAPACK-docs' 
5bf1651452 Find{BLAS,LAPACK}: Revise and extend Intel MKL usage documentation
8585a12bd9 Find{BLAS,LAPACK}: Move enabled language requirement to top of documentation
6a7c055f96 Find{BLAS,LAPACK}: Revise formatting of intro docs
43b581367d Find{BLAS,LAPACK}: Move implementation note from docs to comments
3beac78a13 Find{BLAS,LAPACK}: Revise imported targets documentation layout
6f305cd5fd Find{BLAS,LAPACK}: Factor out vendor documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6218
 2021-06-14 09:48:37 -04:00
Brad King 6022795474 Merge topic 'FindBLAS-oneAPI-mkl' 
130fa72bb3 Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6210
 2021-06-14 09:47:31 -04:00
Brad King f245a20ad0 Merge topic 'xcode13-linker-output' 
a7bbbbf73b Tests: ignore Xcode DVTPlugInManager output
8dcdd4351f Tests: recognize Xcode 13 linker warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6216
 2021-06-14 09:45:44 -04:00
Brad King a7ad3a5f92 Merge topic 'help-cmake_path-IS_PREFIX' into release-3.20 
e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6223
 2021-06-14 09:44:14 -04:00
Brad King 06dc53fc40 Merge branch 'release-3.20' 2021-06-14 09:44:14 -04:00
Brad King cad0a203c9 Merge topic 'help-cmake_path-IS_PREFIX' 
b06887b48c Merge branch 'backport-3.20-help-cmake_path-IS_PREFIX' into help-cmake_path-IS_PREFIX
4665d1e69a Help: cmake_path: fix erroneous example for IS_PREFIX
e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6223
 2021-06-14 09:44:14 -04:00
Brad King 2e533bf924 Merge branch 'release-3.20' 2021-06-14 09:41:51 -04:00
Brad King 43c42e12c8 Merge topic 'fileapi-link-fragments' into release-3.20 
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6220
 2021-06-14 09:41:50 -04:00
Brad King 6fa9f3c695 Merge topic 'fileapi-link-fragments' 
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6220
 2021-06-14 09:41:50 -04:00
Kitware Robot 6230be4975 CMake Nightly Date Stamp 2021-06-14 00:01:14 -04:00
Kitware Robot d0ddef5812 CMake Nightly Date Stamp 2021-06-13 00:01:06 -04:00
Marc Chevrier b06887b48c Merge branch 'backport-3.20-help-cmake_path-IS_PREFIX' into help-cmake_path-IS_PREFIX 2021-06-12 11:24:14 +02:00
Marc Chevrier 4665d1e69a Help: cmake_path: fix erroneous example for IS_PREFIX 
Fixes: #22302
 2021-06-12 11:23:47 +02:00
Marc Chevrier e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX 2021-06-12 11:22:40 +02:00
Kitware Robot 8a4f3fd861 CMake Nightly Date Stamp 2021-06-12 00:01:11 -04:00
Brad King 68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths 
Use the same `cmLinkLineComputer` subclass as the generator does.  This
affects the base directory from which relative paths are computed.

Fixes: #22301
 2021-06-11 11:11:36 -04:00
Gregor Jasny e8dc95ae1e ObjectiveC: Add C17 and C23 support 
Issue: #22297
 2021-06-11 14:47:23 +02:00
Brad King 5bf1651452 Find{BLAS,LAPACK}: Revise and extend Intel MKL usage documentation 
Fixes: #22295
 2021-06-11 08:41:25 -04:00
Brad King 8585a12bd9 Find{BLAS,LAPACK}: Move enabled language requirement to top of documentation 2021-06-11 08:40:37 -04:00