mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,292 Commits 2 Branches 401 Tags
2ac3db2d42482c70631d8be5badc44e61298afd5
Commit Graph

56292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 2ac3db2d42 Merge topic 'vs-zero_check-proj' 
925da7d428 VS: Write ZERO_CHECK.proj for VS19 and above
11b8366e55 VS: Introduce IsInSolution to check whether a target is in sln file
0682cd3657 VS: Add proj as a project type to VsProjectType
6ab2c40c17 cmGlobalVisualStudio7Generator: Drop unused method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6891
 2022-02-14 10:03:50 -05:00
Brad King 7e27ee1585 Merge branch 'release-3.23' 2022-02-14 10:00:45 -05:00
Brad King c033892e07 Merge topic 'doc-debug-find-pkg-var' 
8efd4b5378 cmake::GetDebugFindPkgOutput: Use consistent argument name
546922a57b Help: Fix typo and improve docs for --debug-find-pkg|var options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6977
 2022-02-14 10:00:45 -05:00
Brad King ba1f706768 Merge topic 'doc-debug-find-pkg-var' into release-3.23 
8efd4b5378 cmake::GetDebugFindPkgOutput: Use consistent argument name
546922a57b Help: Fix typo and improve docs for --debug-find-pkg|var options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6977
 2022-02-14 10:00:44 -05:00
Brad King 6e08cd438e Merge branch 'release-3.23' 2022-02-14 09:59:46 -05:00
Brad King 1435d9f899 Merge topic 'FortranCInterface-macos-arch' 
58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6974
 2022-02-14 09:59:46 -05:00
Brad King 59da8629cc Merge topic 'FortranCInterface-macos-arch' into release-3.23 
58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6974
 2022-02-14 09:59:45 -05:00
Brad King 6a84e043db Merge branch 'release-3.23' 2022-02-14 09:58:01 -05:00
Brad King ec92b6dd14 Merge topic 'GoogleTest-discovery-fix-escaping' 
61929f936f GoogleTest: Fix escaping in test names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6965
 2022-02-14 09:58:01 -05:00
Brad King 2adea60f45 Merge topic 'GoogleTest-discovery-fix-escaping' into release-3.23 
61929f936f GoogleTest: Fix escaping in test names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6965
 2022-02-14 09:58:00 -05:00
Brad King 2fa4395bf3 Merge branch 'release-3.23' 2022-02-14 09:49:12 -05:00
Brad King 78499e67e5 Merge branch 'release-3.22' 2022-02-14 09:49:10 -05:00
Brad King d53f3b91fd Merge branch 'release-3.22' into release-3.23 2022-02-14 09:49:04 -05:00
Brad King e6e9c8e484 Merge branch 'restore-target-export-includes' into release-3.22 
Merge-request: !6969
 2022-02-14 09:48:10 -05:00
Craig Scott 8efd4b5378 cmake::GetDebugFindPkgOutput: Use consistent argument name 
The argument name used in the class declaration didn't match the one
used in the implementation file. The one in the header appears to be a
cut-n-paste from GetDebugFindOutput(), but the implementation makes
it clear that "pkg" better infers what the argument represents than "var".
 2022-02-14 21:12:44 +11:00
Craig Scott 546922a57b Help: Fix typo and improve docs for --debug-find-pkg|var options 
Amends d7b18895bc (cmake: Add filtered debug-find options, 2021-12-07)
 2022-02-14 21:06:06 +11:00
Kitware Robot 8876e19847 CMake Nightly Date Stamp 2022-02-14 00:01:35 -05:00
Kitware Robot 2c389efeee CMake Nightly Date Stamp 2022-02-13 00:01:07 -05:00
Sumit Bhardwaj 925da7d428 VS: Write ZERO_CHECK.proj for VS19 and above 
Use VsProjectType::proj as the file format for ZERO_CHECK and write
ZERO_CHECK.proj as a msbuild dependency for other projects.
 2022-02-12 12:09:09 -05:00
Sumit Bhardwaj 11b8366e55 VS: Introduce IsInSolution to check whether a target is in sln file 
Previously, different versions of VS Generators checked whether a target
was in .sln file or not by checking whether the target was to be written
to build system or not.

As we move `ZERO_CHECK.vcxproj` to `.proj`, we want to exclude those
files from being written to `.sln` files too. This commit introduces
`IsInSolution()` at `cmGlobalVisualStudioGenerator` level which can be
customized at specific versioned Generator when needed.
 2022-02-12 12:09:09 -05:00
Sumit Bhardwaj 0682cd3657 VS: Add proj as a project type to VsProjectType 
Add `proj` as a project type to VsProjectType so that it can be consumed
by `ZERO_CHECK` target. This commit adds the type and cleans up the code
that needs to treat `proj` and `csproj` in the same fashion. Next commit
will make changes to add `ZERO_CHECK.proj`.
 2022-02-12 12:09:00 -05:00
Brad King 6ab2c40c17 cmGlobalVisualStudio7Generator: Drop unused method 
Since commit f47b4f68a9 (Drop Visual Studio 7 generator for VS .NET
2002, 2016-03-10, v3.6.0-rc1~268^2), the `WriteTargetDepends` method has
not been used.
 2022-02-12 12:08:44 -05:00
Kitware Robot ee501b06df CMake Nightly Date Stamp 2022-02-12 00:01:14 -05:00
Brad King 58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS 
Fixes: #23218
 2022-02-11 11:56:58 -05:00
Brad King 350c1fd607 Merge branch 'release-3.23' 2022-02-11 09:17:20 -05:00
Brad King bdbacf6b65 Merge topic 'debug-find' 
38de1bef2d find_package: Improve --debug-find-pkg= when using a find module
d634d20397 find_package: Avoid printing debug output header multiple times
df3e29450a find_package: Mention package name in Config mode debug output
636ca7f25c find_package: Fix find module name in --debug-find output
596e185409 find_package: Improve formatting of --debug-find output
2f43527574 Tests: Improve order of RunCMake.find_package cases
a690523fcf cmFindPackageCommand: Drop ComputeIfDebugModeWanted overload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6973
 2022-02-11 09:17:19 -05:00
Brad King 847378d615 Merge topic 'debug-find' into release-3.23 
38de1bef2d find_package: Improve --debug-find-pkg= when using a find module
d634d20397 find_package: Avoid printing debug output header multiple times
df3e29450a find_package: Mention package name in Config mode debug output
636ca7f25c find_package: Fix find module name in --debug-find output
596e185409 find_package: Improve formatting of --debug-find output
2f43527574 Tests: Improve order of RunCMake.find_package cases
a690523fcf cmFindPackageCommand: Drop ComputeIfDebugModeWanted overload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6973
 2022-02-11 09:17:18 -05:00
Brad King 551b0af1e5 Merge topic 'trace-line-range' 
8e1e97ccca Trace: include `line_end` field in json-v1 format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6968
 2022-02-11 09:14:15 -05:00
Brad King e9e8b48576 Merge topic 'test-extproj-rebuild' 
d267602944 Tests: Improve RunCMake.ExternalProject rebuild case robustness

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6971
 2022-02-11 09:11:34 -05:00
Brad King cacf4eda69 Merge topic 'ci-clang-windows' 
90ef30c09d ci: Explicitly disable Java tests on Windows Clang builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6972
 2022-02-11 09:10:52 -05:00
Evgeniy Shcherbina 61929f936f GoogleTest: Fix escaping in test names 
Due to add_command() being a macro it introduced excessive and
nonobvious escaping in different parts of the script. Because of
one of such places the resulting script would have an erroneous
${TEST_LIST} if the user data (in test parameters) had a semicolon.

To eliminate this non-obvious escaping, add_command() was converted
to function. Updated the escaping accordingly.

Fixes: #23059
 2022-02-11 09:03:40 -05:00
Kitware Robot f83d1115e5 CMake Nightly Date Stamp 2022-02-11 00:01:15 -05:00
Brad King 38de1bef2d find_package: Improve --debug-find-pkg= when using a find module 
Extend the feature added by commit d7b18895bc (cmake: Add filtered
debug-find options, 2021-12-07, v3.23.0-rc1~217^2) to enable debug
output for `find_*` calls within a find module or cmake package
configuration file.

Fixes: #23211
 2022-02-10 16:30:10 -05:00
Brad King d634d20397 find_package: Avoid printing debug output header multiple times 2022-02-10 16:30:10 -05:00
Brad King df3e29450a find_package: Mention package name in Config mode debug output 
Otherwise, if there are no paths considered then the output does not
specify the name of the package.
 2022-02-10 16:30:09 -05:00
Brad King 636ca7f25c find_package: Fix find module name in --debug-find output 2022-02-10 16:30:09 -05:00
Brad King 596e185409 find_package: Improve formatting of --debug-find output 
Also spell out more complete content in the test's expect output.
 2022-02-10 16:30:04 -05:00
Brad King 2f43527574 Tests: Improve order of RunCMake.find_package cases 
Sort recently added cases among similar-named cases.
 2022-02-10 15:25:05 -05:00
Brad King a690523fcf cmFindPackageCommand: Drop ComputeIfDebugModeWanted overload 
The overload for `--debug-find-pkg` has the same signature as the base
class method for `--debug-find-var`.  To avoid confusion, drop the
overload and inline it its only call site.
 2022-02-10 15:25:05 -05:00
Brad King d267602944 Tests: Improve RunCMake.ExternalProject rebuild case robustness 
The `CONFIGURE_HANDLED_BY_BUILD` case occasionally fails on builds with
the `Borland Makefiles` generator due to the `make` tool's 1s file
timestamp resolution.  Somehow the 1.125s delay is not enough.  Several
other tests use a 3s delay for Borland tools for the same reason.
 2022-02-10 09:20:13 -05:00
Brad King 90ef30c09d ci: Explicitly disable Java tests on Windows Clang builds 
Extend the change from commit 840fa28d3d (ci: Explicitly disable Java
tests on Windows, 2021-12-16) to cover LLVM/Clang builds on Windows too.
 2022-02-10 09:20:05 -05:00
Brad King 663296ab4f Merge branch 'release-3.23' 2022-02-10 09:14:04 -05:00
Brad King 5d9fe41152 Merge branch 'release-3.22' 2022-02-10 09:14:02 -05:00
Brad King 213a4c4083 Merge branch 'release-3.21' 2022-02-10 09:14:00 -05:00
Brad King 0a08377c4a Merge branch 'release-3.22' into release-3.23 2022-02-10 09:13:51 -05:00
Brad King 32ed1b591c Merge branch 'release-3.23' 2022-02-10 09:11:14 -05:00
Brad King fe5b2e8beb Merge topic 'doc-if-AND-OR' into release-3.23 
41adfc6b04 Help: Clarify precedence of AND and OR in 'if' conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6970
 2022-02-10 09:11:13 -05:00
Brad King cd71d7f663 Merge topic 'doc-if-AND-OR' 
41adfc6b04 Help: Clarify precedence of AND and OR in 'if' conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6970
 2022-02-10 09:11:13 -05:00
Brad King 90a77c60b3 Merge branch 'release-3.23' 2022-02-10 09:09:10 -05:00
Brad King 5593a5d978 Merge topic 'clang-cross-compile-windows-pdb' 
641cb1093b Windows/Clang: Support PDB when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6959
 2022-02-10 09:09:10 -05:00