summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gitlab-ci: shorten job prefixesBen Boeckel2021-11-234-128/+148
| | | | | | | | | | This helps to maximize the amount of information visible in the GitLab web interface. Also document their meaning in the developer documentation and in the CI configuration file directly. See: https://gitlab.com/gitlab-org/gitlab/-/issues/8496
* gitlab-ci: fix comment typoBen Boeckel2021-11-231-1/+1
|
* Merge topic 'env-init-configs' into release-3.22Brad King2021-11-235-2/+31
|\ | | | | | | | | | | | | | | 5b1ed2a646 try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env vars Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6755
| * try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env varsBrad King2021-11-225-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since: * commit e216b9bbd3 (cmake: Allow CMAKE_BUILD_TYPE to be set by environment variable, 2021-06-29, v3.22.0-rc1~503^2~1) * commit ef56eefc9b (cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by environment variable, 2021-06-29, v3.22.0-rc1~503^2) the environment variables are supposed to provide defaults for settings the user otherwise can control via cache entries. However, they accidentally affect `try_compile` projects too, which are supposed to be programmatically controlled. Fixes: #22935
* | Merge topic 'doc-policy-default' into release-3.22Brad King2021-11-233-8/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 69b70968bd Help: Suggest CMAKE_POLICY_DEFAULT_CMP0126 in CMP0126 docs 5b1c24255f Help: Suggest CMAKE_POLICY_DEFAULT_CMP0077 in CMP0077 docs c44636a89b Help: Document more use cases for CMAKE_POLICY_DEFAULT_CMPNNNN Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6756
| * | Help: Suggest CMAKE_POLICY_DEFAULT_CMP0126 in CMP0126 docsBrad King2021-11-221-1/+4
| | |
| * | Help: Suggest CMAKE_POLICY_DEFAULT_CMP0077 in CMP0077 docsBrad King2021-11-221-1/+3
| | | | | | | | | | | | Issue: #20490
| * | Help: Document more use cases for CMAKE_POLICY_DEFAULT_CMPNNNNBrad King2021-11-221-6/+13
| |/
* | Merge topic 'ci-xcode-13.1' into release-3.22Brad King2021-11-231-6/+6
|\ \ | |/ |/| | | | | | | | | 224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6757
| * gitlab-ci: update macOS jobs to use Xcode 13.1Brad King2021-11-221-6/+6
| |
* | Merge topic 'env-mod-path-list-separator' into release-3.22Brad King2021-11-221-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 71a2c9d31b Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on host Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6753
| * | Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on hostCraig Scott2021-11-211-2/+4
| | | | | | | | | Fixes: #22937
* | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-220-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'UseSWIG-create-workingdir' into release-3.21Brad King2021-11-192-1/+2
| |\ \ | | | | | | | | | | | | Merge-request: !6750
* | \ \ Merge branch 'UseSWIG-create-workingdir' into release-3.22Brad King2021-11-222-1/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | Merge-request: !6750
| * | UseSWIG: ensure directory for depfile existsMarc Chevrier2021-11-192-1/+2
| |/ | | | | | | | | | | | | When `Visual Studio` and `Xcode` generators are used, directory for depfile is not implicitely created by CMake when OUTFILE_DIR option is used. Fixes: #22932
* | Merge topic 'ci-gmock' into release-3.22Brad King2021-11-193-2/+4
|\ \ | | | | | | | | | | | | | | | | | | fae34ea007 ci: add gmock to Debian base images Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6746
| * | ci: add gmock to Debian base imagesBrad King2021-11-183-2/+4
|/ / | | | | | | It is already in the Fedora base images.
* | 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