Commit Graph

53822 Commits

Author SHA1 Message Date
Marc Chevrier 14e57e9637 LINK_WHAT_YOU_USE feature: externalize configuration
Currently, this feature is only supported on ELF platforms. So, the property
LINK_WHAT_YOU_USE will be ignored for other plateforms.
Moreover, flags and commands are now controled by CMake variables.

Fixes: #20174
2021-07-09 14:50:50 +02:00
Marc Chevrier 9c5132a586 PGI: Fix "LINKER:" prefix generated separator
Fix a typo from commit 66ea1a3795 (LINK_OPTIONS: Add support of "LINKER:" prefix,
2018-04-30, v3.13.0-rc1~437^2).
2021-07-09 14:49:01 +02:00
Marc Chevrier 8a93de080c cmGeneratorTarget: Add method for LINKER: prefix translation 2021-07-08 13:48:42 +02:00
Brad King 33d6ba668f Merge branch 'release-3.21' 2021-07-08 07:38:10 -04:00
Brad King 709d0369e8 Merge branch 'release-3.20' into release-3.21 2021-07-08 07:38:00 -04:00
Brad King 1eefe800b4 Merge branch 'release-3.20' 2021-07-08 07:37:52 -04:00
Brad King cc654242c7 Merge topic 'intel-oneapi-std-windows' into release-3.21
13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows'
5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows
84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6319
2021-07-08 07:36:57 -04:00
Brad King b372c9e670 Merge branch 'release-3.21' 2021-07-08 07:36:57 -04:00
Brad King 7b942e5068 Merge topic 'intel-oneapi-std-windows'
13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows'
5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows
84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6319
2021-07-08 07:36:57 -04:00
Kitware Robot 94cad518bc CMake Nightly Date Stamp 2021-07-08 00:01:09 -04:00
Brad King dc4b486933 Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20
Merge-request: !6319
2021-07-07 12:53:56 -04:00
Brad King 13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows' 2021-07-07 12:26:10 -04:00
Brad King 5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows
In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based
compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out
activation of the C/C++ standard level selection logic when IntelLLVM is
targeting the MSVC ABI.

Fixes: #22388
2021-07-07 12:25:38 -04:00
Brad King 84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows
In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based
compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out
activation of the C/C++ standard level selection logic when IntelLLVM is
targeting the MSVC ABI.

Fixes: #22388
2021-07-07 12:24:36 -04:00
Brad King ed7b66561e Merge topic 'FindMPI-option-MPI_CXX_SKIP_MPICXX'
1a9ebd1694 FindMPI: Honor MPI_CXX_SKIP_MPICXX when set as a normal variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6315
2021-07-07 09:35:52 -04:00
Brad King 1eaef541cf Merge topic 'ifort_win32_log'
0602e35858 Intel/Fortran: Avoid recording warning 5117 lines in CMakeError.log

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6308
2021-07-07 09:34:48 -04:00
Brad King d49b507bb6 Merge topic 'FindPkgConfig-pkgconf'
94a84dc0af FindPkgConfig: add pkgconf to the search list.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6301
2021-07-07 09:33:42 -04:00
Brad King 900617f977 Merge topic 'FindGLUT-pkg-config'
f90d15458a FindGLUT: Use pkg-config to find flags if available
f3f0401187 FindGLUT: Reduce if/else nesting and indentation
bece79f9be Tests: Add case covering FindGLUT variables and imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6251
2021-07-07 09:32:38 -04:00
Brad King 41c5e0ab2a Merge topic 'help_cxxstd' into release-3.21
5650bebc2f Help: Note CXX_STANDARD values added vs. CMake version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6305
2021-07-07 09:30:12 -04:00
Brad King b8a32aef3f Merge branch 'release-3.21' 2021-07-07 09:30:12 -04:00
Brad King 84ca91bae0 Merge topic 'help_cxxstd'
5650bebc2f Help: Note CXX_STANDARD values added vs. CMake version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6305
2021-07-07 09:30:12 -04:00
Brad King a1d0693175 Merge topic 'correct_cuda_toolkit_version_typo' into release-3.21
0d54276c82 Correct CUDAToolkit_VERSION_MINOR variable name typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6311
2021-07-07 09:29:06 -04:00
Brad King c36741b064 Merge branch 'release-3.21' 2021-07-07 09:29:06 -04:00
Brad King 8bfc96d5ed Merge topic 'correct_cuda_toolkit_version_typo'
0d54276c82 Correct CUDAToolkit_VERSION_MINOR variable name typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6311
2021-07-07 09:29:06 -04:00
Brad King 14109868a8 Merge branch 'release-3.21' 2021-07-07 09:27:46 -04:00
Brad King 2cc6aa4ef4 Merge topic 'cmake-presets-list-no-generator'
d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6314
2021-07-07 09:27:46 -04:00
Brad King 4564c5a77e Merge topic 'cmake-presets-list-no-generator' into release-3.21
d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6314
2021-07-07 09:27:45 -04:00
Brad King 0c972a1f58 Merge branch 'release-3.21' 2021-07-07 09:26:36 -04:00
Brad King 19cd773c44 Merge topic 'xcode13-old-buildsystem' into release-3.21
71a2664ebb Xcode: Ignore deprecated build system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6309
2021-07-07 09:26:35 -04:00
Brad King 85ea0a9112 Merge topic 'xcode13-old-buildsystem'
71a2664ebb Xcode: Ignore deprecated build system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6309
2021-07-07 09:26:35 -04:00
Kitware Robot 0f1efb58c8 CMake Nightly Date Stamp 2021-07-07 00:01:11 -04:00
Brad King 1a9ebd1694 FindMPI: Honor MPI_CXX_SKIP_MPICXX when set as a normal variable
Express the cache entry with `option()`.  In combination with policies
CMP0077 and CMP0102, this allows project code to control the switch with
a variable:

```
set(MPI_CXX_SKIP_MPICXX TRUE)
find_package(MPI COMPONENTS CXX)
```
2021-07-06 19:41:35 -04:00
Michael Hirsch 5650bebc2f Help: Note CXX_STANDARD values added vs. CMake version 2021-07-06 18:10:54 -04:00
Kyle Edwards d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator
Fixes: #22389
2021-07-06 14:36:27 -04:00
Michael Hirsch 0602e35858 Intel/Fortran: Avoid recording warning 5117 lines in CMakeError.log 2021-07-06 14:03:14 -04:00
Brad King 16d9c317a3 Merge branch 'release-3.21' 2021-07-06 09:51:35 -04:00
Brad King 13fa970149 Merge branch 'release-3.20' into release-3.21 2021-07-06 09:51:29 -04:00
Brad King dde05cf378 Merge branch 'release-3.20' 2021-07-06 09:51:20 -04:00
Brad King 0e45d4d699 Merge branch 'release-3.21' 2021-07-06 09:48:45 -04:00
Brad King 7fdd806630 Merge topic 'makefile-normalize-depfile'
30926620bb Merge branch 'backport-3.21-makefile-normalize-depfile'
6bc6ffb9a9 Merge branch 'backport-3.20-makefile-normalize-depfile'
6a6efdcaed Makefiles: Normalize compiler-generated depfile paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6297
2021-07-06 09:48:45 -04:00
Brad King 0cd8bba051 Merge topic 'makefile-normalize-depfile' into release-3.21
6bc6ffb9a9 Merge branch 'backport-3.20-makefile-normalize-depfile'
6a6efdcaed Makefiles: Normalize compiler-generated depfile paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6297
2021-07-06 09:48:44 -04:00
Brad King b9077be139 Merge branch 'release-3.21' 2021-07-06 09:47:50 -04:00
Brad King 5bd8c6f250 Merge topic 'ci-fixups' into release-3.21
46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE
3ede66e17a Tests: Fix newline matching in several RunCMake.* cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6298
2021-07-06 09:47:50 -04:00
Brad King 058253aa87 Merge topic 'ci-fixups'
46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE
3ede66e17a Tests: Fix newline matching in several RunCMake.* cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6298
2021-07-06 09:47:50 -04:00
Robert Maynard 0d54276c82 Correct CUDAToolkit_VERSION_MINOR variable name typo 2021-07-06 08:43:13 -04:00
Gregor Jasny 71a2664ebb Xcode: Ignore deprecated build system
With Xcode 13 the key to suppress the check has changed.
Tested with Xcode 12.5 and 13.0-beta2.
2021-07-06 09:29:17 +02:00
Kitware Robot a27fa90aa1 CMake Nightly Date Stamp 2021-07-06 00:01:10 -04:00
Craig Scott d37c9e4dd2 Merge branch 'release-3.21' 2021-07-05 20:02:29 -04:00
Craig Scott b8186351dc Merge topic 'doc-3.21-release' into release-3.21
24b76eaa93 Help: Improve readability and accuracy of runtime deps-related content
308e5b30c9 Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS option
52dec01729 Help: Add missing versionadded 3.21 for file(RENAME) options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6302
2021-07-05 20:02:28 -04:00
Craig Scott c97823b9b7 Merge topic 'doc-3.21-release'
24b76eaa93 Help: Improve readability and accuracy of runtime deps-related content
308e5b30c9 Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS option
52dec01729 Help: Add missing versionadded 3.21 for file(RENAME) options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6302
2021-07-05 20:02:28 -04:00