Commit Graph

55069 Commits

Author SHA1 Message Date
Brad King
eeaf1e10cb Merge topic 'FindPython-static-libs-hint' into release-3.22
a35bf772de FindPython: clarify static libraries hint usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6772
2021-12-02 11:48:38 -05:00
Brad King
3883b11edb Merge topic 'rpath-unrecognized-format' into release-3.22
643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty
5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6779
2021-12-02 11:45:37 -05:00
Brad King
643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty
Since commit 2e1149874d (cmSystemTools: Support multiple binary formats,
2021-06-14, v3.22.0-rc1~575^2) the `file(RPATH_...)` operations fail on
files that are not ELF or XCOFF format.  Previously the RPATH operations
tolerated files of unknown format if the goal was to produce a file with
an empty RPATH.  Restore this tolerance in order to support setting an
empty RPATH on GNU ld scripts.

Fixes: #22963
2021-12-01 12:58:11 -05:00
Brad King
5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void
The `CheckRPath` arguments are always used now.
2021-12-01 12:40:03 -05:00
Marc Chevrier
a35bf772de FindPython: clarify static libraries hint usage
Fixes: #22956
2021-12-01 10:06:45 -05:00
Brad King
55c4f54e48 Merge topic 'doc-if-basic-expressions' into release-3.22
294581a443 Help: Be more explicit about the behavior of if(<string>)
3a9695557d Help: Explicitly state that if(ENV{some_var}) is always false

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6768
2021-12-01 09:37:40 -05:00
Brad King
cab4551889 Merge topic 'GNUInstallDirs-conda-fix' into release-3.22
7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6773
2021-12-01 09:34:32 -05:00
Brad King
bd7f276c52 Merge topic 'mingw-strftime-crash' into release-3.22
992e6d7c5d mingw: fix calling convention for strftime()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6762
2021-12-01 09:33:22 -05:00
Craig Scott
294581a443 Help: Be more explicit about the behavior of if(<string>) 2021-12-01 18:59:23 +11:00
Craig Scott
3a9695557d Help: Explicitly state that if(ENV{some_var}) is always false 2021-12-01 18:30:26 +11:00
Christoph Reiter
992e6d7c5d mingw: fix calling convention for strftime()
`strftime` uses `__cdecl` and not `__stdcall`.  This was exposed by
refactoring in commit 26c9fbab46 (MINGW-w64: Fix string(TIMESTAMP) build
on 32bits, 2021-11-16, v3.22.0~1^2).

This fixes a crash creating a timestamp with clang+mingw-w64 targeting x86.

Fixes: #22939
2021-11-30 11:03:33 -05:00
Robert Maynard
7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous
Update logic added by commit ecaca8c129 (GNUInstallDirs now aware of
conda lib directory requirements, 2021-09-08, v3.22.0-rc1~142^2).
When it is ambiguous if we are doing a conda install or a system
install prefer using the system library directory.

Fixes: #22962
2021-11-30 10:51:33 -05:00
Brad King
5109a22d61 Merge topic 'doc-CMAKE_INSTALL_MODE' into release-3.22
3caeee0c86 Help: Clarify CMAKE_INSTALL_MODE documentation
699d4a98e2 Help: Use definition list for allowed values of CMAKE_INSTALL_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6743
2021-11-30 08:46:11 -05:00
Brad King
ee2a3254ee Merge topic 'compiler-id-classic-c' into release-3.22
0fc8b2f61c CompilerId: Restore support for classic C by avoiding C++ style comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6759
2021-11-29 12:27:36 -05:00
Felix Lelchuk
3caeee0c86 Help: Clarify CMAKE_INSTALL_MODE documentation
Fixes: #22869
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
2021-11-24 08:30:38 +11:00
Craig Scott
699d4a98e2 Help: Use definition list for allowed values of CMAKE_INSTALL_MODE
Clean up the wording as well for improved consistency
and clarity.
2021-11-24 08:20:04 +11:00
Brad King
9f07f1939b Merge topic 'ci-rename-jobs' into release-3.22
7d5828e293 gitlab-ci: shorten job prefixes
cfa478e518 gitlab-ci: fix comment typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6760
2021-11-23 11:40:11 -05:00
Brad King
ba20241422 Merge branch 'release-3.21' into release-3.22 2021-11-23 10:30:20 -05:00
Ben Boeckel
7d5828e293 gitlab-ci: shorten job prefixes
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
2021-11-23 10:11:25 -05:00
Ben Boeckel
cfa478e518 gitlab-ci: fix comment typo 2021-11-23 10:06:32 -05:00
Brad King
0fc8b2f61c CompilerId: Restore support for classic C by avoiding C++ style comments
C++ style comments were added by commit fc3a1cbdd8 (CompilerID: Compiler
extensions default detection, 2021-05-29, v3.22.0-rc1~52^2~2), but they
may not be supported by the default mode of some C compilers.  Use
C-style comments instead.  For consistency, do this for all languages.

Fixes: #22942
2021-11-23 10:00:31 -05:00
Brad King
b414cd3587 Merge topic 'env-init-configs' into release-3.22
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
2021-11-23 09:55:16 -05:00
Brad King
0bd48412a1 Merge topic 'doc-policy-default' into release-3.22
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
2021-11-23 09:53:42 -05:00
Brad King
6bab24e0d3 Merge topic 'ci-xcode-13.1' into release-3.22
224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6757
2021-11-23 09:52:48 -05:00
Brad King
b54d61c4a0 Merge branch 'ci-xcode-13.1' into release-3.21
Merge-request: !6757
2021-11-22 19:40:47 -05:00
Brad King
224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1 2021-11-22 18:04:43 -05:00
Brad King
69b70968bd Help: Suggest CMAKE_POLICY_DEFAULT_CMP0126 in CMP0126 docs 2021-11-22 14:57:22 -05:00
Brad King
5b1c24255f Help: Suggest CMAKE_POLICY_DEFAULT_CMP0077 in CMP0077 docs
Issue: #20490
2021-11-22 14:56:17 -05:00
Brad King
c44636a89b Help: Document more use cases for CMAKE_POLICY_DEFAULT_CMPNNNN 2021-11-22 14:55:36 -05:00
Brad King
5b1ed2a646 try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env vars
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
2021-11-22 12:50:42 -05:00
Brad King
deb9b07636 Merge topic 'env-mod-path-list-separator' into release-3.22
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
2021-11-22 11:19:02 -05:00
Brad King
8431aea9ba Merge branch 'release-3.21' into release-3.22 2021-11-22 11:12:10 -05:00
Brad King
454344f35d Merge branch 'UseSWIG-create-workingdir' into release-3.22
Merge-request: !6750
2021-11-22 11:11:56 -05:00
Craig Scott
71a2c9d31b Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on host
Fixes: #22937
2021-11-21 17:50:29 +11:00
Brad King
bad7959397 Merge branch 'UseSWIG-create-workingdir' into release-3.21
Merge-request: !6750
2021-11-19 12:12:07 -05:00
Marc Chevrier
7224eb5185 UseSWIG: ensure directory for depfile exists
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
2021-11-19 17:50:52 +01:00
Brad King
354cd15029 Merge topic 'ci-gmock' into release-3.22
fae34ea007 ci: add gmock to Debian base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6746
2021-11-19 09:08:15 -05:00
Brad King
fae34ea007 ci: add gmock to Debian base images
It is already in the Fedora base images.
2021-11-18 12:54:32 -05:00
Brad King
ff8c3acc0f CMake 3.22.0 v3.22.0 2021-11-18 10:51:22 -05:00
Brad King
b33cae9d2d Merge topic 'fix-mingw32-gcc11-ice' into release-3.22
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
2021-11-18 10:38:22 -05:00
Antons Jeļkins
26c9fbab46 MINGW-w64: Fix string(TIMESTAMP) build on 32bits.
Rephrase the string(TIMESTAMP) implementation not to
cause gcc-11 ICE on MSYS2/mingw32.

Fixes: #22916
2021-11-18 09:17:38 -05:00
Antons Jeļkins
f0eae9292b cmTimestamp: Declare component buffer before MinGW-specific code 2021-11-18 09:17:38 -05:00
Brad King
a5eed9e5e0 Merge branch 'release-3.21' into release-3.22 2021-11-18 09:00:25 -05:00
Brad King
c468f983c0 Merge branch 'release-3.20' into release-3.21 2021-11-18 09:00:15 -05:00
Brad King
cb39d50e21 Merge topic 'IntelLLVM-Fortran-copy-mod' into release-3.22
209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6740
2021-11-18 08:59:17 -05:00
Brad King
e64a0b6c3d Merge topic 'backport-libuv-mingw-w64' into release-3.22
acc14edd70 libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6735
2021-11-18 08:57:26 -05:00
Brad King
80b6b201a6 Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.21
Merge-request: !6740
2021-11-17 10:42:51 -05:00
Brad King
7cc7f9aa26 Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.20
Merge-request: !6740
2021-11-17 10:42:37 -05:00
Brad King
209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators
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
2021-11-17 10:41:30 -05:00
Brad King
ed9b971694 Merge topic 'gtest_discover_tests-PRE_TEST-dep' into release-3.22
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
2021-11-17 08:44:28 -05:00