summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2022-02-1573-1500/+3596
|\ | | | | | | | | * upstream-LibArchive: LibArchive 2022-02-09 (9147def1)
| * LibArchive 2022-02-09 (9147def1)LibArchive Upstream2022-02-1574-1532/+3630
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 9147def1da7ad1bdd47b3559eb1bfeeb0e0f374b (v3.6.0).
* | libarchive: Update script to get 3.6.0Brad King2022-02-151-1/+1
| |
* | Merge topic 'cpack-rpm-component-var-off'Brad King2022-02-151-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 114a04f89c CPack/RPM: Honor CPACK_RPM_<component>_PACKAGE_ variables when set OFF Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6963
| * | CPack/RPM: Honor CPACK_RPM_<component>_PACKAGE_ variables when set OFFPhilip Bailey2022-02-081-1/+1
| | | | | | | | | | | | Fixes: #23182
* | | Merge topic 'ci-windows-no-java'Brad King2022-02-152-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4b90688aa0 ci: Explicitly disable Java tests on Windows with Borland and Open Watcom Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6979
| * | | ci: Explicitly disable Java tests on Windows with Borland and Open WatcomBrad King2022-02-142-0/+6
| | | | | | | | | | | | | | | | | | | | Extend the change from commit 840fa28d3d (ci: Explicitly disable Java tests on Windows, 2021-12-16) to cover Borland and Open Watcom builds.
* | | | Merge branch 'release-3.23'Brad King2022-02-150-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'release-3.22' into release-3.23Brad King2022-02-150-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.22'Brad King2022-02-150-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'FindMatlab-mcr911' into release-3.22Brad King2022-02-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !6976
* | \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-02-150-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'FindMatlab-mcr911' into release-3.23Brad King2022-02-151-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6976
* | | | | | | Merge topic 'FindMatlab-mcr911'Brad King2022-02-151-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6976
| * | | | | | FindMatlab: Fix version detection for MCR >= 9.10Tom M2022-02-141-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent MCR versions have the following `VersionInfo.xml`: <version>9.11.0.1837725</version> Fix parsing of multiple digits in the version components so that we do not mistake this for version `9.1`.
* | | | | | Merge branch 'release-3.23'Brad King2022-02-150-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'doc-example-package-components' into release-3.23Brad King2022-02-152-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5317015e68 Help: use package-specific var for supported component list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6975
* | \ \ \ \ \ Merge topic 'doc-example-package-components'Brad King2022-02-152-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5317015e68 Help: use package-specific var for supported component list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6975
| * | | | | | Help: use package-specific var for supported component listConnor Imes2022-02-142-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always using `_supported_components` causes conflicts when transitive dependencies also set this variable, e.g., because the developers followed these code samples. An even more general approach could be to set `_${CMAKE_FIND_PACKAGE_NAME}_supported_components` instead, but such a change should then be applied to other variables for consistency. Fixes: #23112
* | | | | | | Merge branch 'release-3.23'Brad King2022-02-150-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-no-versioned-soname' into release-3.23Brad King2022-02-152-0/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f7e6b3fd4 Help: Document CMAKE_PLATFORM_NO_VERSIONED_SONAME Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6978
* | \ \ \ \ \ \ Merge topic 'doc-no-versioned-soname'Brad King2022-02-152-0/+15
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f7e6b3fd4 Help: Document CMAKE_PLATFORM_NO_VERSIONED_SONAME Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6978
| * | | | | | | Help: Document CMAKE_PLATFORM_NO_VERSIONED_SONAMERalf Habacker2022-02-142-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable was added by commit 42f74df6d4 (Add basic Android platform module, 2014-06-06, v3.1.0-rc1~416^2), but was not previously documented. Fixes: #23227
* | | | | | | | Merge branch 'release-3.23'Brad King2022-02-150-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'doc-export-command' into release-3.23Brad King2022-02-151-43/+88
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19b273b729 Help: Organize and clarify export() command documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6981
* | | | | | | | Merge topic 'doc-export-command'Brad King2022-02-151-43/+88
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19b273b729 Help: Organize and clarify export() command documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6981
| * | | | | | | Help: Organize and clarify export() command documentationBrad King2022-02-141-43/+88
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add section headers for each signature, and a synopsis linking to them. Re-order sections to introduce the main `export(TARGETS)` functionality before mentioning the `export(EXPORT)` shorthand, which may be confused with `install(EXPORT)`. Fixes: #23221
* | | | | | | CMake Nightly Date StampKitware Robot2022-02-151-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'vs-zero_check-proj'Brad King2022-02-1411-52/+258
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | VS: Write ZERO_CHECK.proj for VS19 and aboveSumit Bhardwaj2022-02-124-31/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use VsProjectType::proj as the file format for ZERO_CHECK and write ZERO_CHECK.proj as a msbuild dependency for other projects.
| * | | | | | VS: Introduce IsInSolution to check whether a target is in sln fileSumit Bhardwaj2022-02-124-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | VS: Add proj as a project type to VsProjectTypeSumit Bhardwaj2022-02-123-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | | | | cmGlobalVisualStudio7Generator: Drop unused methodBrad King2022-02-122-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'release-3.23'Brad King2022-02-140-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-debug-find-pkg-var' into release-3.23Brad King2022-02-142-5/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ Merge topic 'doc-debug-find-pkg-var'Brad King2022-02-142-5/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | cmake::GetDebugFindPkgOutput: Use consistent argument nameCraig Scott2022-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
| * | | | | | | Help: Fix typo and improve docs for --debug-find-pkg|var optionsCraig Scott2022-02-141-4/+5
| | |_|/ / / / | |/| | | | | | | | | | | | Amends d7b18895bc (cmake: Add filtered debug-find options, 2021-12-07)
* | | | | | | Merge branch 'release-3.23'Brad King2022-02-140-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'FortranCInterface-macos-arch' into release-3.23Brad King2022-02-142-0/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6974
* | \ \ \ \ \ \ Merge topic 'FortranCInterface-macos-arch'Brad King2022-02-142-0/+19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6974
| * | | | | | | FortranCInterface: Fix mangling detection for x86_64 on arm64 macOSBrad King2022-02-112-0/+19
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #23218
* | | | | | | Merge branch 'release-3.23'Brad King2022-02-140-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'GoogleTest-discovery-fix-escaping' into release-3.23Brad King2022-02-148-24/+147
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61929f936f GoogleTest: Fix escaping in test names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6965
* | \ \ \ \ \ \ Merge topic 'GoogleTest-discovery-fix-escaping'Brad King2022-02-148-24/+147
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61929f936f GoogleTest: Fix escaping in test names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6965
| * | | | | | | GoogleTest: Fix escaping in test namesEvgeniy Shcherbina2022-02-118-24/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'release-3.23'Brad King2022-02-140-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-02-140-0/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'release-3.22'Brad King2022-02-140-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'restore-target-export-includes' into release-3.22Brad King2022-02-1411-13/+71
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6969