summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.22.0v3.22.0Brad King2021-11-181-1/+1
|
* Merge topic 'fix-mingw32-gcc11-ice' into release-3.22Brad King2021-11-181-5/+11
|\ | | | | | | | | | | | | | | 26c9fbab46 MINGW-w64: Fix string(TIMESTAMP) build on 32bits. f0eae9292b cmTimestamp: Declare component buffer before MinGW-specific code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6737
| * MINGW-w64: Fix string(TIMESTAMP) build on 32bits.Antons Jeļkins2021-11-181-3/+9
| | | | | | | | | | | | | | Rephrase the string(TIMESTAMP) implementation not to cause gcc-11 ICE on MSYS2/mingw32. Fixes: #22916
| * cmTimestamp: Declare component buffer before MinGW-specific codeAntons Jeļkins2021-11-181-2/+2
|/
* Merge branch 'release-3.21' into release-3.22Brad King2021-11-180-0/+0
|\
| * Merge branch 'release-3.20' into release-3.21Brad King2021-11-180-0/+0
| |\
| | * Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.20Brad King2021-11-171-1/+1
| | |\ | | | | | | | | | | | | Merge-request: !6740
| * | \ Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.21Brad King2021-11-171-1/+1
| |\ \ \ | | | |/ | | |/| | | | | Merge-request: !6740
* | | | Merge topic 'IntelLLVM-Fortran-copy-mod' into release-3.22Brad King2021-11-181-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6740
| * | | IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generatorsBrad King2021-11-171-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The Makefile generators use an internal `cmake -E cmake_copy_f90_mod` tool to avoid rebuilding module consumers when the `.mod` content changes only in a trivial way (e.g. the time it was built). This is done with logic specific to each vendor's module file format. Enable the "Intel" format support when using the IntelLLVM compiler (ifx) too. Issue: #22922
* | | Merge topic 'backport-libuv-mingw-w64' into release-3.22Brad King2021-11-181-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | acc14edd70 libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6735
| * | | libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branchBrad King2021-11-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport libuv commit `3e90bc76` (build: fix build failures with MinGW new headers, 2021-11-03). Fixes: #22916
* | | | Merge topic 'gtest_discover_tests-PRE_TEST-dep' into release-3.22Brad King2021-11-176-4/+82
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 1bf6d5979d gtest_discover_tests: Re-run PRE_TEST discovery on any arg change 715af43124 Tests: Fix and update wrongly named GoogleTest stdout file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6728
| * | | gtest_discover_tests: Re-run PRE_TEST discovery on any arg changeCraig Scott2021-11-165-1/+79
| | | | | | | | | | | | | | | | Fixes: #22912
| * | | Tests: Fix and update wrongly named GoogleTest stdout fileCraig Scott2021-11-141-3/+3
| | | | | | | | | | | | | | | | The GoogleTest-skip-test output was never being checked since this test was added due to this file having the wrong name.
* | | | Merge topic 'doc-tests-labels-dynamic' into release-3.22Brad King2021-11-153-5/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 250acbb099 Help: Improve cross-referencing of test LABELS and related features a77bdefa3e Help: Add missing version details for Additional Test Measurements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6726
| * | | | Help: Improve cross-referencing of test LABELS and related featuresCraig Scott2021-11-133-2/+12
| | | | |
| * | | | Help: Add missing version details for Additional Test MeasurementsCraig Scott2021-11-131-3/+10
| |/ / /
* | | | Merge topic 'doc-gtest_discover_tests-filter' into release-3.22Brad King2021-11-151-2/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6727
| * | | 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-091-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).
View Lorry Controller Status