mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 21:30:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
58,359 Commits 2 Branches 401 Tags
2d87db1a2fd7fa530c262fe7011106e4451a872a
Commit Graph

58359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot 2d87db1a2f CMake Nightly Date Stamp 2022-07-26 00:01:07 -04:00
Brad King a0ff592bf4 Merge branch 'release-3.24' 2022-07-25 12:02:20 -04:00
Brad King 1cde77e526 Merge topic 'doc-find_package-BYPASS_PROVIDER' 
4f7a0c25d2 Help: Document BYPASS_PROVIDER keyword for find_package()
76370e06b8 Help: Minor grammar fix for the Using Dependencies manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7501
 2022-07-25 12:02:20 -04:00
Brad King 22c5352990 Merge topic 'doc-find_package-BYPASS_PROVIDER' into release-3.24 
4f7a0c25d2 Help: Document BYPASS_PROVIDER keyword for find_package()
76370e06b8 Help: Minor grammar fix for the Using Dependencies manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7501
 2022-07-25 12:02:19 -04:00
Brad King 180a27528c Merge branch 'release-3.24' 2022-07-25 12:00:40 -04:00
Brad King 4f8f577015 Merge topic 'cmake-help-flags-after-dashdash' 
14a0e750cb cmake: In -P mode ignore flags like `--version` after `--`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7496
 2022-07-25 12:00:39 -04:00
Brad King 7ed8c2de6a Merge topic 'cmake-help-flags-after-dashdash' into release-3.24 
14a0e750cb cmake: In -P mode ignore flags like `--version` after `--`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7496
 2022-07-25 12:00:38 -04:00
Brad King f73c069a3d Merge branch 'release-3.24' 2022-07-25 11:58:53 -04:00
Brad King cd762c0f49 Merge branch 'release-3.23' 2022-07-25 11:58:48 -04:00
Brad King 843998a206 Merge branch 'release-3.23' into release-3.24 2022-07-25 11:58:41 -04:00
Brad King f06a4f1488 Merge branch 'release-3.24' 2022-07-25 11:57:49 -04:00
Brad King cc663a8c1d Merge topic 'cmake-P-path-args' 
febe3190f0 Merge branch 'backport-3.23-cmake-P-path-args'
846a650ff7 cmake: In -P mode ignore extra paths on the command line
c362cba566 cmake: simplify to a single source of truth of working mode
261fa5db39 cmake: In -P mode ignore extra paths on the command line
314135cdf1 cmake: simplify to a single source of truth of working mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7494
 2022-07-25 11:57:48 -04:00
Brad King 7c9bda81bd Merge topic 'cmake-P-path-args' into release-3.24 
febe3190f0 Merge branch 'backport-3.23-cmake-P-path-args'
846a650ff7 cmake: In -P mode ignore extra paths on the command line
c362cba566 cmake: simplify to a single source of truth of working mode
261fa5db39 cmake: In -P mode ignore extra paths on the command line
314135cdf1 cmake: simplify to a single source of truth of working mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7494
 2022-07-25 11:57:47 -04:00
Brad King 2d435f404d Merge branch 'release-3.24' 2022-07-25 11:56:30 -04:00
Brad King ec809a80c5 Merge topic 'revert-vs-ZERO_CHECK-proj' 
26b724cf2b Merge branch 'backport-3.24-revert-vs-ZERO_CHECK-proj'
289932ded0 VS: Revert "Write ZERO_CHECK.proj for VS19 and above"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7499
 2022-07-25 11:56:30 -04:00
Brad King cba5652a1f Merge topic 'revert-vs-ZERO_CHECK-proj' into release-3.24 
289932ded0 VS: Revert "Write ZERO_CHECK.proj for VS19 and above"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7499
 2022-07-25 11:56:29 -04:00
Brad King 42755f22a5 Merge branch 'release-3.24' 2022-07-25 11:55:13 -04:00
Brad King 363e8f8452 Merge topic 'revert-ui-check' 
778aaf6fdc AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7498
 2022-07-25 11:55:13 -04:00
Brad King 6336ee80d3 Merge topic 'revert-ui-check' into release-3.24 
778aaf6fdc AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7498
 2022-07-25 11:55:12 -04:00
Brad King 74c2cc630f Merge topic 'update-kwsys' 
6d84355274 Merge branch 'upstream-KWSys' into update-kwsys
f98fa3e543 KWSys 2022-07-22 (ac792bf7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7486
 2022-07-25 11:54:00 -04:00
Brad King ea209b9f9d Merge topic 'command-arg-parser-result' 
8a18e82e95 cmCMakePathCommand: Report keyword errors via argument parser results
7e4a9afa1a cmCMakeHost*Command: Report keyword errors via argument parser results
74ec6b63c2 cmFileCommand: Report keyword errors via argument parser results
e56108f629 cmExecuteProcessCommand: Report keyword errors via argument parser results
b7c82b26b0 cmArgumentParser: Capture keyword errors in parse results
50876f6b9a cmArgumentParser: Add structure to capture operational results
5955ec1992 cmArgumentParser: Store keyword action map with explicit name
119e1f7fbc cmArgumentParser: Factor out common static/dynamic implementation
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7488
 2022-07-25 11:52:27 -04:00
Craig Scott 96f60d63b5 Merge branch 'release-3.24' 2022-07-25 08:04:35 -04:00
Craig Scott bfc68ccf9f Merge topic 'doc-CMP0097-FetchContent' 
1796ffbde9 Help: CMP0097 applies to FetchContent as well

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7504
 2022-07-25 08:04:35 -04:00
Craig Scott e305fec8ad Merge topic 'doc-CMP0097-FetchContent' into release-3.24 
1796ffbde9 Help: CMP0097 applies to FetchContent as well

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7504
 2022-07-25 08:04:34 -04:00
Craig Scott cae8bd1976 Merge branch 'release-3.24' 2022-07-25 08:03:19 -04:00
Craig Scott 34329ee8a3 Merge topic 'doc-path-genex-corrections' 
c7ab76e0ff Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7505
 2022-07-25 08:03:19 -04:00
Craig Scott acc98dcbec Merge topic 'doc-path-genex-corrections' into release-3.24 
c7ab76e0ff Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7505
 2022-07-25 08:03:18 -04:00
Kitware Robot 867be20c80 CMake Nightly Date Stamp 2022-07-25 00:01:13 -04:00
Craig Scott c7ab76e0ff Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...> 2022-07-24 17:11:58 +10:00
Craig Scott 1796ffbde9 Help: CMP0097 applies to FetchContent as well 
The omission of FetchContent_Declare() in the original policy docs
was just an oversight.
 2022-07-24 16:23:36 +10:00
Kitware Robot 0f376bfc5a CMake Nightly Date Stamp 2022-07-24 00:01:05 -04:00
Craig Scott 4f7a0c25d2 Help: Document BYPASS_PROVIDER keyword for find_package() 
Fixes: #23669
 2022-07-23 21:43:49 +10:00
Craig Scott 76370e06b8 Help: Minor grammar fix for the Using Dependencies manual 2022-07-23 21:30:53 +10:00
Kitware Robot 251c1fc56c CMake Nightly Date Stamp 2022-07-23 00:01:09 -04:00
Brad King e77ec7f76f Merge branch 'backport-3.23-cmake-P-path-args' into release-3.23 
Merge-request: !7494
 2022-07-22 17:01:01 -04:00
Robert Maynard 14a0e750cb cmake: In -P mode ignore flags like --version after -- 
Fixes: #21031
 2022-07-22 14:30:21 -04:00
Brad King febe3190f0 Merge branch 'backport-3.23-cmake-P-path-args' 2022-07-22 13:56:09 -04:00
Robert Maynard 846a650ff7 cmake: In -P mode ignore extra paths on the command line 
Fixes: #23748
 2022-07-22 13:55:52 -04:00
Robert Maynard c362cba566 cmake: simplify to a single source of truth of working mode 2022-07-22 13:55:45 -04:00
Robert Maynard 261fa5db39 cmake: In -P mode ignore extra paths on the command line 
Fixes: #23748
 2022-07-22 13:53:52 -04:00
Robert Maynard 314135cdf1 cmake: simplify to a single source of truth of working mode 2022-07-22 13:53:12 -04:00
Brad King 26b724cf2b Merge branch 'backport-3.24-revert-vs-ZERO_CHECK-proj' 2022-07-22 13:40:56 -04:00
Brad King 289932ded0 VS: Revert "Write ZERO_CHECK.proj for VS19 and above" 
Revert commit a334f1b906 (VS: Write ZERO_CHECK.proj for VS19 and above,
2021-12-24, v3.24.0-rc1~607^2) and a supporting change from
commit 7219988b00 (VS: Exclude ZERO_CHECK.proj from .sln for
include_external_msproject, 2022-07-15, v3.24.0-rc4~1^2).

The change was made to support `dotnet` tooling in addition to
`msbuild`.  However, not having `ZERO_CHECK` in the `.sln` breaks common
interactive workflows.  Revert the change for now.  Later it can be
re-introduced behind some kind of option that enables `dotnet` support.

Fixes: #23726
Issue: #20227
 2022-07-22 12:54:20 -04:00
Brad King 6d84355274 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-07-22 (ac792bf7)
 2022-07-22 12:00:58 -04:00
KWSys Upstream f98fa3e543 KWSys 2022-07-22 (ac792bf7) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit ac792bf7cd1ba6a00d8bfa7b9914d1ab9ecf48ea (master).

Upstream Shortlog
-----------------

Clemens Wasser (3):
      1c156fd1 SystemTools: Better GetCasePathName caching
      9e48ae84 SystemTools: Readd direct GetCasePathName caching
      0cac8ee5 Directory: Use Win32 find file functions
 2022-07-22 12:00:58 -04:00
Brad King 778aaf6fdc AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files" 
Revert commit 10668f26c9 (AUTOUIC: Fix internal paths of generated
ui_foo.h files, 2022-05-21, v3.24.0-rc3~20^2).  It broke some existing
projects that use more than one `.ui` file of the same name.

Fixes: #23759
Issue: #23523
 2022-07-22 11:48:40 -04:00
Brad King 8a18e82e95 cmCMakePathCommand: Report keyword errors via argument parser results 2022-07-22 10:32:25 -04:00
Brad King 7e4a9afa1a cmCMakeHost*Command: Report keyword errors via argument parser results 2022-07-22 10:32:24 -04:00
Brad King 74ec6b63c2 cmFileCommand: Report keyword errors via argument parser results 2022-07-22 10:32:24 -04:00
Brad King e56108f629 cmExecuteProcessCommand: Report keyword errors via argument parser results 2022-07-22 10:32:24 -04:00