summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIPBrad King2021-12-071-1/+1
| | | | Fixes: #22986
* Merge topic 'ci-vs-managed' into release-3.22Brad King2021-12-061-1/+1
|\ | | | | | | | | | | | | 69419c5870 ci: Enable more VS tests that use managed code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6782
| * ci: Enable more VS tests that use managed codeBrad King2021-12-031-1/+1
|/ | | | | | | A couple of VS tests were conditioned on `NOT CMAKE_GENERATOR_TOOLSET`, but in CI jobs with VS we always set `CMAKE_GENERATOR_TOOLSET`. Make the condition specific to excluding the `v90` toolset, which was its original intention anyway.
* Merge topic 'vs-csproj-scripts' into release-3.22Brad King2021-12-037-26/+25
|\ | | | | | | | | | | | | 13a7ae2194 VS: Revert "Add missing label in C# project-build events" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6781
| * VS: Revert "Add missing label in C# project-build events"Brad King2021-12-027-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit b284a21fee (VS: Add missing label in C# project-build events, 2021-09-03, v3.22.0-rc1~156^2). The change broke cases using multiple successful custom commands. Revert it pending further investigation into the interaction of the generated script code with `Microsoft.Common.CurrentVersion.targets`, and whether this is needed for all managed projects or just C# projects. Also add a test covering the case that was broken. Fixes: #22964 Issue: #21440
* | Merge topic 'FindPkgConfig-pkgconf' into release-3.22Brad King2021-12-031-1/+1
|\ \ | |/ |/| | | | | | | | | 90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6780
| * FindPkgConfig: Restore finding pkg-config before pkgconfBrad King2021-12-021-1/+1
|/ | | | | | | | | | | Since commit 94a84dc0af (FindPkgConfig: add pkgconf to the search list., 2021-07-02, v3.22.0-rc1~468^2), `pkgconf` is preferred over `pkg-config` if they appear in the same directory. In some environments, `pkg-config` may be a wrapper that adds semantics beyond either `pkgconf` or the normal `pkg-config`. Prefer `pkg-config` over `pkgconf` in order to preserve the prior behavior in such environments. Fixes: #22976
* Merge topic 'FindPython-static-libs-hint' into release-3.22Brad King2021-12-023-0/+15
|\ | | | | | | | | | | | | a35bf772de FindPython: clarify static libraries hint usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6772
| * FindPython: clarify static libraries hint usageMarc Chevrier2021-12-013-0/+15
| | | | | | | | Fixes: #22956
* | Merge topic 'rpath-unrecognized-format' into release-3.22Brad King2021-12-0213-4/+85
|\ \ | |/ |/| | | | | | | | | | | | | 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
| * file(RPATH): Restore tolerance of unknown formats if new RPATH is emptyBrad King2021-12-0113-2/+85
| | | | | | | | | | | | | | | | | | | | | | 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
| * cmSystemTools: Remove unnecessary mark-as-used casts to voidBrad King2021-12-011-2/+0
|/ | | | The `CheckRPath` arguments are always used now.
* Merge topic 'doc-if-basic-expressions' into release-3.22Brad King2021-12-011-4/+15
|\ | | | | | | | | | | | | | | 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
| * Help: Be more explicit about the behavior of if(<string>)Craig Scott2021-12-011-4/+13
| |
| * Help: Explicitly state that if(ENV{some_var}) is always falseCraig Scott2021-12-011-1/+3
| |
* | Merge topic 'GNUInstallDirs-conda-fix' into release-3.22Brad King2021-12-011-1/+3
|\ \ | | | | | | | | | | | | | | | | | | 7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6773
| * | GNUInstallDirs: Prefer system lib64 over conda lib when ambiguousRobert Maynard2021-11-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'mingw-strftime-crash' into release-3.22Brad King2021-12-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 992e6d7c5d mingw: fix calling convention for strftime() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6762
| * | | mingw: fix calling convention for strftime()Christoph Reiter2021-11-301-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | `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
* | | Merge topic 'doc-CMAKE_INSTALL_MODE' into release-3.22Brad King2021-11-302-16/+111
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Help: Clarify CMAKE_INSTALL_MODE documentationFelix Lelchuk2021-11-232-10/+86
| | | | | | | | | | | | | | | | Fixes: #22869 Co-Authored-By: Craig Scott <craig.scott@crascit.com>
| * | | Help: Use definition list for allowed values of CMAKE_INSTALL_MODECraig Scott2021-11-231-8/+27
| | |/ | |/| | | | | | | Clean up the wording as well for improved consistency and clarity.
* | | Merge topic 'compiler-id-classic-c' into release-3.22Brad King2021-11-293-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 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
| * | CompilerId: Restore support for classic C by avoiding C++ style commentsBrad King2021-11-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'ci-rename-jobs' into release-3.22Brad King2021-11-234-129/+149
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d5828e293 gitlab-ci: shorten job prefixes cfa478e518 gitlab-ci: fix comment typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6760
| * | | 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 branch 'release-3.21' into release-3.22Brad King2021-11-230-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch 'ci-xcode-13.1' into release-3.21Brad King2021-11-231-6/+6
| |\ \ | | | | | | | | | | | | Merge-request: !6757
* | \ \ 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
|\ \ | |/
generated by cgit v0.12 at 2025-01-23 02:28:01 (GMT)