mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-19 14:28:34 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,454 Commits 2 Branches 401 Tags
ef162bb40bcda8dcbd561ed2b1a6c4bd46288add
Commit Graph

56454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King ef162bb40b Tests: Extend RunCMake.SymlinkTrees with more symlink layouts 
Inspired-by: Ben Boeckel <ben.boeckel@kitware.com>
Issue: #16228
 2022-02-24 17:41:46 -05:00
Brad King 802b76140d Tests: Extend RunCMake.SymlinkTrees to verify paths passed to compiler 
Verify that the paths to source files and include directories
are passed to the compiler with the symlinks preserved.
 2022-02-24 13:47:43 -05:00
Brad King b0ac0fbe0e Tests: Extend RunCMake.SymlinkTrees with directory argument variants 
Run each symlink layout case with various ways to pass the source
and binary directories.
 2022-02-24 13:47:43 -05:00
Brad King 6c971b5e93 Tests: Generalize RunCMake.SymlinkTrees implementation 
Accept paths to the source and binary directories as arguments.
Prepare to support more ways of passing the source and binary
directories to `cmake`.
 2022-02-24 13:47:43 -05:00
Brad King 0443bdb8d4 Tests: Simplify RunCMake.SymlinkTrees per-case implementation 
Avoid needing a `.cmake` file named for every case.
 2022-02-24 13:47:43 -05:00
Brad King 0435e938f8 Merge branch 'release-3.23' 2022-02-24 13:01:40 -05:00
Brad King 3de53510ac Merge topic 'ghs_fix_rtos_dir' 
005c7dc9e7 GHS: Store full path of Integrity OS directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7017
 2022-02-24 13:01:40 -05:00
Brad King 7d110c25ed Merge topic 'ghs_fix_rtos_dir' into release-3.23 
005c7dc9e7 GHS: Store full path of Integrity OS directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7017
 2022-02-24 13:01:39 -05:00
Brad King 31101e0fde Merge topic 'cmake-minimum' 
14eb8a6ab9 libarchive: Simplify hard-coded options for build within CMake
d6b811fb82 Require CMake 3.13+ to configure CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7016
 2022-02-24 13:00:14 -05:00
Brad King 9568325cf4 Merge topic 'cpack-zstd-parallel' 
525faec4e9 CPack: Add parallel zstd compression
215c4efd3e cmArchiveWrite: Factor out thread count selection
29f63129be CPack: Format CPACK_THREADS compression methods as a definition list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7003
 2022-02-24 12:57:32 -05:00
Brad King 39a3c3eda3 Merge topic 'zero_check_proj' 
a334f1b906 VS: Write ZERO_CHECK.proj for VS19 and above

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7010
 2022-02-24 12:55:40 -05:00
Kitware Robot dd9edd99a4 CMake Nightly Date Stamp 2022-02-24 00:01:17 -05:00
Fred Baksik 005c7dc9e7 GHS: Store full path of Integrity OS directory 
Fixes build project error because the OS directory was a relative
path from the binary directory.

Fixes issue during project regeneration where the `-os_dir` project option
was missing because GHS_OS_DIR was not properly stored in the cache
file.

This error was introduced by commit aa59eaac4f (GHS: Allow setting GHS
variables from toolchain file, 2021-11-15, v3.23.0-rc1~337^2).
 2022-02-23 11:33:35 -05:00
Brad King 885a17b2db Merge branch 'release-3.23' 2022-02-23 10:08:34 -05:00
Brad King 352ea99bba CMake 3.23.0-rc2 v3.23.0-rc2 2022-02-23 09:22:31 -05:00
Brad King fa92aa0a23 Merge branch 'release-3.23' 2022-02-23 09:00:37 -05:00
Brad King 0956b3bc92 Merge topic 'update-expat' 
07f9ce4f8c Merge branch 'upstream-expat' into update-expat
4c031b9417 expat 2022-02-20 (65a21f2b)
9d035ba28d expat: Update script to get Expat 2.4.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7015
 2022-02-23 09:00:37 -05:00
Brad King bc0d7c19db Merge topic 'update-expat' into release-3.23 
07f9ce4f8c Merge branch 'upstream-expat' into update-expat
4c031b9417 expat 2022-02-20 (65a21f2b)
9d035ba28d expat: Update script to get Expat 2.4.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7015
 2022-02-23 09:00:36 -05:00
Brad King 9c215c38b6 Merge topic 'ci-bzr-p4' 
c4b305da63 ci: Explicitly enable CTest.Update{BZR,CVS,GIT,HG,P4,SVN} tests
f9526f39a1 ci: Add bzr and p4 to Debian and Fedora base images
6f7580c7ad Tests: Run CTest.UpdateP4 tests only if explicitly enabled
c737367e92 Tests: Print p4.log on server failure in CTest.UpdateP4
787495bb74 Tests: Preemptively create test HOME .bazaar directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7014
 2022-02-23 08:54:53 -05:00
Brad King 7ee245ac56 Merge topic 'add-ignore-revs-file' 
93f52b0931 Utilities/Git: add a file for refs to ignore when blaming

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7012
 2022-02-23 08:54:12 -05:00
Russell Greene 525faec4e9 CPack: Add parallel zstd compression 2022-02-23 08:39:32 -05:00
Russell Greene 215c4efd3e cmArchiveWrite: Factor out thread count selection 
Prepare to use it for more than one compression method.
 2022-02-23 08:39:10 -05:00
Kitware Robot 1e2f8bd9db CMake Nightly Date Stamp 2022-02-23 00:01:16 -05:00
Brad King 14eb8a6ab9 libarchive: Simplify hard-coded options for build within CMake 
Take advantage of policy CMP0077 NEW behavior to hard-code settings,
defined by `option()` calls in upstream libarchive, without adding
them to our cache.
 2022-02-22 17:51:18 -05:00
Brad King d6b811fb82 Require CMake 3.13+ to configure CMake itself 
In particular, guarantee that policy `CMP0077` has `NEW` behavior.
This will be useful to hard-code options of third-party libraries
without polluting our own cache.
 2022-02-22 17:50:06 -05:00
Brad King 07f9ce4f8c Merge branch 'upstream-expat' into update-expat 
# By Expat Upstream
* upstream-expat:
  expat 2022-02-20 (65a21f2b)
 2022-02-22 17:11:37 -05:00
Expat Upstream 4c031b9417 expat 2022-02-20 (65a21f2b) 
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit 65a21f2b2a306d29b44e70264aca948aa0454219 (R_2_4_6).
 2022-02-22 17:11:37 -05:00
Brad King 9d035ba28d expat: Update script to get Expat 2.4.6 2022-02-22 17:11:28 -05:00
Brad King 29f63129be CPack: Format CPACK_THREADS compression methods as a definition list 
Prepare to add more entries beyond `xz`.
 2022-02-22 15:31:37 -05:00
Brad King c4b305da63 ci: Explicitly enable CTest.Update{BZR,CVS,GIT,HG,P4,SVN} tests 
Avoid relying on heuristics to enable these tests.
Be sure they run in CI where expected.
 2022-02-22 14:01:36 -05:00
Brad King f9526f39a1 ci: Add bzr and p4 to Debian and Fedora base images 
Perforce does not provide binaries for `aarch64`, so leave it out for
that architecture.

Fedora now packages `breezy` instead of the original `bzr`. Note that
breezy does not have the xmloutput plugin needed for `bzr log --xml`.
This is also why commit 1972a75536 (Tests: Drop CTestUpdate.BZR test
check for xmloutput plugin, 2022-02-04) observed that there is no
`bzr xmlplugins` command.
 2022-02-22 13:58:59 -05:00
Brad King 6f7580c7ad Tests: Run CTest.UpdateP4 tests only if explicitly enabled 
The test occasionally fails with "Gave up waiting for server to start".
Drop our heuristic so we can enable it only on specific builds.
 2022-02-22 13:58:35 -05:00
Brad King c737367e92 Tests: Print p4.log on server failure in CTest.UpdateP4 2022-02-22 13:53:26 -05:00
Brad King d985c12fa4 Merge topic 'ghs_build_event_bugfix' 
6acf06a2cd GHS: fix build event script error on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7002
 2022-02-22 12:59:05 -05:00
Brad King 6068143fe1 Merge topic 'update-kwsys' 
f634e77b2e Merge branch 'upstream-KWSys' into update-kwsys
8d9ced350d KWSys 2022-02-18 (599dc923)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7004
 2022-02-22 12:58:22 -05:00
Brad King 4878ad8f39 Merge branch 'release-3.23' 2022-02-22 12:56:51 -05:00
Brad King 8bbca4ecf9 Merge topic 'cuda-archs' 
f75299b803 CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7007
 2022-02-22 12:56:51 -05:00
Brad King 2e963c41b4 Merge topic 'cuda-archs' into release-3.23 
f75299b803 CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7007
 2022-02-22 12:56:50 -05:00
Brad King e2587d6f5e Merge branch 'release-3.23' 2022-02-22 12:55:55 -05:00
Brad King fec7867264 Merge topic 'CheckTypeSize-doc' 
65e4d29e35 CheckTypeSize: Modernize and clarify documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7006
 2022-02-22 12:55:55 -05:00
Brad King e6a364c999 Merge topic 'CheckTypeSize-doc' into release-3.23 
65e4d29e35 CheckTypeSize: Modernize and clarify documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7006
 2022-02-22 12:55:54 -05:00
Brad King 787495bb74 Tests: Preemptively create test HOME .bazaar directory 
Occasionally one of the `CTest.UpdateBZR` tests fails with:

    bzr: ERROR: [...] File exists: '/.../Tests/CMakeFiles/TestHome/.bazaar'

Create the directory ahead of time to eliminate any chance of a
time-of-check-time-of-use race.
 2022-02-22 10:03:38 -05:00
Craig Scott f635f4ed05 Merge topic 'ep-REBASE_CHECKOUT-fallback' 
dec997f04e ExternalProject: Remove extra quotes in for-each-ref update step
704e87ee8c Help: Clarify behavior of REBASE_CHECKOUT when switching branches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7011
 2022-02-22 07:36:05 -05:00
Kitware Robot d8e3796368 CMake Nightly Date Stamp 2022-02-22 00:01:08 -05:00
Ben Boeckel 93f52b0931 Utilities/Git: add a file for refs to ignore when blaming 
This file may be passed to `git blame` through either the
`--ignore-revs-file` argument or the `blame.ignoreRevsFile`
configuration to ignore certain commits when performing blames.

Note that if Git is unable to find an older commit for a given line,
commits in this file may still be given as the source of a line.

The file uses features (namely empty lines and comments) which were
added in Git 2.20, released Dec 2018.
 2022-02-21 10:53:42 -05:00
Craig Scott dec997f04e ExternalProject: Remove extra quotes in for-each-ref update step 
The --format=... argument to git for-each-ref was using a stray pair
of single quotes around the format string. These were then part of
the output, which caused it to never match the checkout_name.
The end result was that a REBASE_CHECKOUT always became a
CHECKOUT in all scenarios.

Fixes: #23216
 2022-02-21 18:28:46 +11:00
Craig Scott 704e87ee8c Help: Clarify behavior of REBASE_CHECKOUT when switching branches 
Issue: #23216
 2022-02-21 18:28:16 +11:00
Kitware Robot 7847a44930 CMake Nightly Date Stamp 2022-02-21 00:01:17 -05:00
Sumit Bhardwaj a334f1b906 VS: Write ZERO_CHECK.proj for VS19 and above 
For VS 19 and above, switch the format of project file to
`VsProjectType::proj` for ZERO_CHECK target. The `ZERO_CHECK.proj`
consists of primitive MSBuild commands only and has no dependency on any
other targets or props files. This proj file is written as a
`ProjectReference` for other targets, but is not written to the sln
file.
 2022-02-20 16:47:36 -08:00
Kitware Robot cc8f5a7dbe CMake Nightly Date Stamp 2022-02-20 00:01:08 -05:00