summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Clarify meaning of filter expression in gtest_discover_tests()Craig Scott2021-11-141-2/+5
|
* CMake 3.22.0-rc3v3.22.0-rc3Brad King2021-11-121-1/+1
|
* Merge topic 'cmp0128-fixup' into release-3.22Brad King2021-11-127-28/+47
|\ | | | | | | | | | | | | | | e47dfce75d CMP0128: Enable/disable extensions if standard same as default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6723
| * CMP0128: Enable/disable extensions if standard same as defaultRaul Tambre2021-11-117-28/+47
| | | | | | | | | | | | | | | | | | | | | | This was intended to be part of the initial MR (!6177), but accidentally went missing when debugging nightly failures on less common systems. Noticed during !6711 review as the comment about this behaviour didn't match the code. Documentation for CMP0128 is updated to remove a false case and note the two cases related to this. Fixes #22224.
* | Merge branch 'release-3.21' into release-3.22Brad King2021-11-120-0/+0
|\ \
| * \ Merge branch 'release-3.20' into release-3.21Brad King2021-11-120-0/+0
| |\ \
| | * \ Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.20Brad King2021-11-111-0/+1
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !6718
| * | \ \ Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.21Brad King2021-11-111-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Merge-request: !6718
* | | | | Merge topic 'IntelLLVM-Fortran-frontend-variant' into release-3.22Brad King2021-11-121-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6718
| * | | | Fortran: Save frontend variant persistently for IntelLLVMWilliam R. Dieter2021-11-111-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20), our IntelLLVM compiler support populates `CMAKE_Fortran_COMPILER_FRONTEND_VARIANT`. However, the frontend variant was not stored in `CMakeCompilerFortran.cmake`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | Merge topic 'ti-armcl-unknown-arg-warning' into release-3.22Brad King2021-11-121-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 220f78e253 TI: Recognize invalid compiler option warning during try_compile() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6705
| * | | | TI: Recognize invalid compiler option warning during try_compile()Craig Scott2021-11-111-0/+1
| | |_|/ | |/| | | | | | Fixes: #22866
* | | | Merge topic 'ci-vs2022' into release-3.22Brad King2021-11-125-28/+29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 190d2b5d55 gitlab-ci: Update Windows jobs to VS 2022 ac32794983 gitlab-ci: Re-organize Windows job tags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6724
| * | | gitlab-ci: Update Windows jobs to VS 2022Brad King2021-11-115-28/+29
| | | |
| * | | gitlab-ci: Re-organize Windows job tagsBrad King2021-11-112-5/+5
|/ / / | | | | | | | | | Name the tag groups based on the VS version needed.
* | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'IntelLLVM-no-xilink' into release-3.21Brad King2021-11-101-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !6719
* | \ \ Merge topic 'IntelLLVM-no-xilink' into release-3.22Brad King2021-11-111-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6719
| * | | IntelLLVM: Use MSVC linker with MSVC frontend variantWilliam R. Dieter2021-11-101-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel compiler (pre-LLVM) expected xilink.exe and had special logic to set xilink.exe. The newer LLVM-based compiler does not want xilink.exe. link.exe works better for host code, and is the default, so change the matching condition such that the old compiler matches (and gets xilink.exe) and the new compiler gets the default link.exe it expects. A better solution will be to use the compiler as the linker. A future change will switch to compiler as linker by default, but that fix needs more validation. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | Merge topic 'doc-CMP0128' into release-3.22Craig Scott2021-11-101-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8371056fbb Help: Correct inaccuracies in wording for CMP0128 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6711
| * | | Help: Correct inaccuracies in wording for CMP0128Craig Scott2021-11-081-1/+3
| | | |
* | | | Merge topic 'nmc-reuse-from' into release-3.22Brad King2021-11-091-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 244550997f PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6713
| * | | | PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVCCristian Adam2021-11-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The copy_idb_pdb.cmake script would be executed for every configuration for all configurations. Debug would still want to get the RelWithDebInfo files, and the other way around.
* | | | | Merge topic 'msvc-pch-reuse-config' into release-3.22Brad King2021-11-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95fa27d94d PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6712
| * | | | | PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differCristian Adam2021-11-081-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the Debug configuration contains `/ZI` but the RelWithDebInfo doesn't then the copy_pdb_idb.cmake script will cause problems due to the fact that it was common for both configurations but they are incompatible with each other.
* | | | | Merge topic 'doc-preset-inheritance' into release-3.22Brad King2021-11-091-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6dc6412477 Help: Use stronger wording in rule about preset inheritance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6710
| * | | | | Help: Use stronger wording in rule about preset inheritanceYonggang Luo2021-11-081-3/+3
|/ / / / /
* | | | | Merge topic 'vs-framework-version' into release-3.22Brad King2021-11-0811-39/+182
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d51246c662 VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022 f97f8537f3 VS: Model a default target framework e40cedddc0 cmVisualStudio10TargetGenerator: Refactor target framework selection 78782cc7dc cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6699
| * | | | | VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022Brad King2021-11-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSBuild defaults to v4.0 but VS 2022 does not install it anymore. Explicitly specify a newer framework version by default. Use a version that VS 2022 installs without selecting a separate component. Fixes: #22835
| * | | | | VS: Model a default target frameworkBrad King2021-11-0610-10/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fields to the VS generator to select a target framework. Migrate the existing default for VS 12 .NET CF for Windows CE. Report the values in `CMAKE_VS_*` variables and use them for the CSharp compiler id project too. Issue: #22849
| * | | | | cmVisualStudio10TargetGenerator: Refactor target framework selectionBrad King2021-11-061-35/+53
| | | | | | | | | | | | | | | | | | | | | | | | Split the selection from the generation of the resulting element(s).
| * | | | | cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatformBrad King2021-11-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-organize the method to make room for additional `CMAKE_GENERATOR_PLATFORM` processing.
* | | | | | Merge topic 'doc-CUDA_STANDARD' into release-3.22Brad King2021-11-081-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84667a6f3c Help: Clarify valid versus supported values for CUDA_STANDARD Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6707
| * | | | | | Help: Clarify valid versus supported values for CUDA_STANDARDCraig Scott2021-11-071-5/+11
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.18 added the first support for any compiler for 17 and 20, but those were recognized as valid values in earlier CMake versions even though there was no compiler that supported them. Make this distinction clear to avoid creating the impression that these standards could be usefully used before CMake 3.18. While 98 is recognized as a valid value, it also just gets treated as 03 internally. Document this behavior as well. Fixes: #22711
* | | | | | Merge topic 'doc-PKG_CONFIG_ARGN' into release-3.22Craig Scott2021-11-081-16/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76c0281421 Help: Clarify how PKG_CONFIG env var initializes cache vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6706
| * | | | | Help: Clarify how PKG_CONFIG env var initializes cache varsCraig Scott2021-11-071-16/+33
|/ / / / / | | | | | | | | | | Fixes: #22870
* | | | | Merge topic 'nmc-cross-config-target-deps' into release-3.22Brad King2021-11-0511-13/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95f44e00cd Ninja Multi-Config: Fix custom command target dependencies in cross-configs a883363935 Ninja Multi-Config: Fix internal cross-config target dependency ordering 16e24748c5 Ninja Multi-Config: Fix cross-config custom command dependency tracing Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6702
| * | | | | Ninja Multi-Config: Fix custom command target dependencies in cross-configsBrad King2021-11-046-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator expressions in a non-cross custom command's `COMMAND` arguments are evaluated in the command config. Target-level dependencies implied by `TARGET_FILE` must therefore be cross dependencies. This is important to generate proper target-level dependencies on the cross-config build statements for the target to which the custom command is attached. Fixes: #22855
| * | | | | Ninja Multi-Config: Fix internal cross-config target dependency orderingBrad King2021-11-041-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7abc3d61ac (Ninja Multi-Config: Fix issue with framework dependencies and Autogen, 2020-02-13, v3.17.0-rc2~18^2) the `cmLinkItem` comparison operator was updated to order identical strings by the cross-config boolean. We need to order identical targets that way too in order to represent both a cross and non-cross dependency on the same target. Issue: #22855
| * | | | | Ninja Multi-Config: Fix cross-config custom command dependency tracingBrad King2021-11-044-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Process `CMAKE_CROSS_CONFIGS` and friends to properly configure the generator for cross-config behavior before custom command dependency tracing.
* | | | | | Merge topic 'CheckLinkerFlag-policies' into release-3.22Brad King2021-11-051-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58c8d649e1 CheckLinkerFlag: Set policies needed by the implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6701
| * | | | | CheckLinkerFlag: Set policies needed by the implementationThomas Dickerson2021-11-041-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module was added in CMake 3.18 by commit af96c0f4fa (CheckLinkerFlag: Add module to check validity of linker flags, 2020-05-16, v3.18.0-rc1~103^2), but it is still possible for projects to use it without setting policies to the 3.18 version level.
* | | | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-040-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'doc-TARGET_RUNTIME_DLLS' into release-3.21Brad King2021-11-032-2/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6700
| * \ \ \ \ Merge branch 'msvc-cxx-modules-scanDependencies' into release-3.21Brad King2021-11-031-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !6696
| * \ \ \ \ \ Merge branch 'GNUtoMS-vs2022' into release-3.21Brad King2021-11-031-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6695
* | \ \ \ \ \ \ Merge topic 'doc-TARGET_RUNTIME_DLLS' into release-3.22Brad King2021-11-042-2/+14
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 001870d451 Help: Clarify TARGET_RUNTIME_DLLS behavior on imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !6700
| * | | | | | | Help: Clarify TARGET_RUNTIME_DLLS behavior on imported targetsBrad King2021-11-032-2/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator expression does not report the locations of `.dll` files on imported targets with the `UNKNWON` type, since their `IMPORTED_LOCATION` refers to the import library and not the DLL. Fixes: #22845
* | | | | | | Merge topic 'FindHDF5-avoid-duplicate-library-entries' into release-3.22Brad King2021-11-041-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 247f1149e1 FindHDF5: clear language-specific libraries list before discovery f56963cf05 FindHDF5: clear library output variables at the top of the module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6698
| * | | | | | | FindHDF5: clear language-specific libraries list before discoveryBen Boeckel2021-11-031-0/+6
| | | | | | | |
generated by cgit v0.12 at 2025-02-14 17:58:37 (GMT)