mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,040 Commits 2 Branches 385 Tags
c44636a89b93c6c024d8aa318f932beec0453db4
Commit Graph

55040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
c44636a89b Help: Document more use cases for CMAKE_POLICY_DEFAULT_CMPNNNN 2021-11-22 14:55:36 -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
Brad King
acc14edd70 libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branch 
Backport libuv commit `3e90bc76` (build: fix build failures with MinGW
new headers, 2021-11-03).

Fixes: #22916
 2021-11-16 11:58:45 -05:00
Craig Scott
1bf6d5979d gtest_discover_tests: Re-run PRE_TEST discovery on any arg change 
Fixes: #22912
 2021-11-16 09:45:26 -05:00
Brad King
40ae565832 Merge topic 'doc-tests-labels-dynamic' into release-3.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
 2021-11-15 09:24:41 -05:00
Brad King
ca4b81d69f Merge topic 'doc-gtest_discover_tests-filter' into release-3.22 
1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6727
 2021-11-15 09:21:51 -05:00
Craig Scott
715af43124 Tests: Fix and update wrongly named GoogleTest stdout file 
The GoogleTest-skip-test output was never being checked since this
test was added due to this file having the wrong name.
 2021-11-14 17:55:49 +11:00
Craig Scott
1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests() 2021-11-14 16:49:23 +11:00
Craig Scott
250acbb099 Help: Improve cross-referencing of test LABELS and related features 2021-11-13 20:45:05 +11:00
Craig Scott
a77bdefa3e Help: Add missing version details for Additional Test Measurements 2021-11-13 20:44:05 +11:00
Brad King
fed67fa40d CMake 3.22.0-rc3 v3.22.0-rc3 2021-11-12 09:15:07 -05:00
Brad King
9740573673 Merge topic 'cmp0128-fixup' into release-3.22 
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
 2021-11-12 09:02:40 -05:00
Brad King
5154dd2450 Merge branch 'release-3.21' into release-3.22 2021-11-12 09:00:05 -05:00
Brad King
bb48c75817 Merge branch 'release-3.20' into release-3.21 2021-11-12 08:59:43 -05:00
Brad King
c1fe4f68e4 Merge topic 'IntelLLVM-Fortran-frontend-variant' into release-3.22 
b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6718
 2021-11-12 08:58:57 -05:00
Brad King
031ba22de2 Merge topic 'ti-armcl-unknown-arg-warning' into release-3.22 
220f78e253 TI: Recognize invalid compiler option warning during try_compile()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6705
 2021-11-12 08:55:14 -05:00
Brad King
ad85ab206e Merge topic 'ci-vs2022' into release-3.22 
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
 2021-11-12 08:53:21 -05:00
Raul Tambre
e47dfce75d CMP0128: Enable/disable extensions if standard same as default 
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.
 2021-11-11 21:55:04 +02:00
Brad King
190d2b5d55 gitlab-ci: Update Windows jobs to VS 2022 2021-11-11 13:12:27 -05:00
Brad King
ac32794983 gitlab-ci: Re-organize Windows job tags 
Name the tag groups based on the VS version needed.
 2021-11-11 12:51:32 -05:00
Brad King
521c49eebc Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.21 
Merge-request: !6718
 2021-11-11 11:24:01 -05:00
Brad King
09ef62fd98 Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.20 
Merge-request: !6718
 2021-11-11 11:23:35 -05:00
William R. Dieter
b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM 
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>
 2021-11-11 11:22:07 -05:00
Craig Scott
220f78e253 TI: Recognize invalid compiler option warning during try_compile() 
Fixes: #22866
 2021-11-11 10:53:31 -05:00
Brad King
2ad300ebd7 Merge branch 'release-3.21' into release-3.22 2021-11-11 10:46:12 -05:00
Brad King
e2ceaec991 Merge topic 'IntelLLVM-no-xilink' into release-3.22 
48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6719
 2021-11-11 10:45:19 -05:00
Brad King
b0ee34373a Merge branch 'IntelLLVM-no-xilink' into release-3.21 
Merge-request: !6719
 2021-11-10 13:43:41 -05:00
William R. Dieter
48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant 
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>
 2021-11-10 13:41:06 -05:00
Craig Scott
0b8d692697 Merge topic 'doc-CMP0128' into release-3.22 
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
 2021-11-10 05:47:33 -05:00
Brad King
95ea17dfd3 Merge topic 'nmc-reuse-from' into release-3.22 
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
 2021-11-09 07:53:18 -05:00
Brad King
2eb96cbe41 Merge topic 'msvc-pch-reuse-config' into release-3.22 
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
 2021-11-09 07:52:29 -05:00