summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMakePresets: Add include fieldKyle Edwards2022-01-0742-7/+351
| | | | Fixes: #21331
* Refactor: Generalize file graph in CMakePresetsKyle Edwards2022-01-074-29/+112
| | | | | | | | Before this refactoring, presets had a simple flag that marked them as "user" or "not user", and checking the file graph of two files was as simple as checking this flag. This only allowed for two files in the graph. Generalize the code to allow for arbitrarily many files in the graph.
* Refactor: Split JSON processing into configure, build, and test presetsKyle Edwards2022-01-066-599/+821
| | | | Split up the file so that it won't be too big on some systems.
* Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraphKyle Edwards2022-01-0613-221/+224
| | | | And change all references to "file" to say "graph" instead.
* Merge topic 'try-link-ld-warning-no_pie'Brad King2022-01-061-0/+1
|\ | | | | | | | | | | | | | | f745e0497e CheckCompilerFlags: Catch linker warning about ignored flags Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6836
| * CheckCompilerFlags: Catch linker warning about ignored flagsCraig Scott2022-01-021-0/+1
| | | | | | | | | | | | | | Example warning from arm64 macOS that this will now catch: ld: warning: -no_pie ignored for arm64 Fixes: #22961
* | Merge topic 'xcode-framework-system-includes'Brad King2022-01-066-1/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | 7d99cff236 Xcode: Properly identify frameworks with system includes Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6815
| * | Xcode: Properly identify frameworks with system includesGregor Jasny2021-12-226-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | Check the complete include path for being a system include, not the derived framework search path. The code for Ninja and Makefile generators does exactly the same. Fixes: #23011
* | | CMake Nightly Date StampKitware Robot2022-01-061-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-01-051-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-01-041-1/+1
| | |
* | | Merge topic 'cmMachO_h_missing_header'Craig Scott2022-01-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a1ca50d9fc cmMachO: Add missing header for std::unique_ptr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6835
| * | | cmMachO: Add missing header for std::unique_ptrCraig Scott2022-01-021-0/+1
| | |/ | |/| | | | | | | | | | Builds were previously relying on <memory> being included by <string>, but not all compilers do that and we shouldn't be relying on that anyway.
* | | Merge topic 'doc-if-floating-point'Craig Scott2022-01-031-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6b170578b8 Help: Non-zero floating point numbers are true in if() expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6834
| * | | Help: Non-zero floating point numbers are true in if() expressionsCraig Scott2022-01-031-1/+2
| |/ / | | | | | | Fixes: #22991
* | | CMake Nightly Date StampKitware Robot2022-01-031-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-01-021-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2022-01-011-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-311-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-301-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-261-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-251-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-241-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-12-231-1/+1
| |
* | Merge topic 'copyright-year'Brad King2021-12-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 1313e940c7 Copyright.txt: Update year range to end in 2022 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6827
| * | Copyright.txt: Update year range to end in 2022Brad King2021-12-221-1/+1
|/ /
* | Merge branch 'release-3.22'Brad King2021-12-220-0/+0
|\ \
| * \ Merge topic 'ci-windows-no-java' into release-3.22Brad King2021-12-221-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 85a07b4b49 ci: Explicitly disable Java tests on VS builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6826
* | \ \ Merge topic 'ci-windows-no-java'Brad King2021-12-221-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 352e68e95c Merge branch 'backport-3.22-ci-windows-no-java' into ci-windows-no-java e217153dc0 ci: Explicitly disable Java tests on VS builds 85a07b4b49 ci: Explicitly disable Java tests on VS builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6826
| * \ \ \ Merge branch 'backport-3.22-ci-windows-no-java' into ci-windows-no-javaBrad King2021-12-220-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | ci: Explicitly disable Java tests on VS buildsBrad King2021-12-221-0/+1
| | |/ / | | | | | | | | | | | | | | | | Extend the change from commit 840fa28d3d (ci: Explicitly disable Java tests on Windows, 2021-12-16) to cover VS builds too.
| * | | ci: Explicitly disable Java tests on VS buildsBrad King2021-12-221-0/+1
|/ / / | | | | | | | | | | | | Extend the change from commit 840fa28d3d (ci: Explicitly disable Java tests on Windows, 2021-12-16) to cover VS builds too.
* | | Merge topic 'vs-csharp-dotnet-sdk'Brad King2021-12-2226-53/+439
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0eea32a376 VS: Add DOTNET_SDK property to generate SDK-style C# projects a450cc9533 VS: Set ResolveNugetPackages to false for ALL_BUILD and ZERO_CHECK fa76e5d194 cmVisualStudio10TargetGenerator: Factor out helper for classic MSBuild project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6634
| * | | VS: Add DOTNET_SDK property to generate SDK-style C# projectsSumit Bhardwaj2021-12-2126-3/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in cmVisualStudio10TargetGenerator::Generate to write .Net SDK-style project for VS generators VS 19 and above. Also adds documentation and tests. Issue: #20227
| * | | VS: Set ResolveNugetPackages to false for ALL_BUILD and ZERO_CHECKSumit Bhardwaj2021-12-151-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When SDK-style targets in a project are restored, ResolveNugetPackageAssets target is not skipped. However, ALL_BUILD and ZERO_CHECK do not have any nuget packages to resolve and the build fails. This commit sets ResolveNugetPackages to false which skips the target and the build succeeds.
| * | | cmVisualStudio10TargetGenerator: Factor out helper for classic MSBuild projectSumit Bhardwaj2021-12-152-52/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for generating .Net SDK style project, refactor cmVisualStudio10TargetGenerato::Generate to split the functionality to write classic MSBuild project file. This commit only introduces a helper function and moves the functionality there. A later commit will add WriteSdkStyleProjectFile, the call to it, and the rest of the .Net SDK-style changes.
* | | | Merge topic 'cpack-freebsd-pkg'Brad King2021-12-222-12/+133
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3715e08e4 FreeBSD: tidy up a76f19d5e8 FreeBSD: handle new package-file-suffix d5ae2f9754 FreeBSD: fix up the package name 0ac1ac798e FreeBSD: migrate to newer pkg_create(3) API Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Semphriss <dev.semphris@gmail.com> Merge-request: !5854
| * | | | FreeBSD: tidy upAdriaan de Groot2021-12-211-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - mismatched comments and code, - remove superfluous log of the "Real package" (which can still change! log the changed filename if it does), - the "fix up the package name" code was replacing the pkg 1.17 suffix by the pkg 1.17 suffix, so it wasn't really being useful. Whether **any** of the backwards- compatibility packaging code is useful is another thing.
| * | | | FreeBSD: handle new package-file-suffixAdriaan de Groot2021-12-211-11/+31
| | | | |
| * | | | FreeBSD: fix up the package nameAdriaan de Groot2021-12-212-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using libpkg, the output filename is determined by libpkg itself, based on information in the manifest: package name and version, basically. This doesn't necessarily match the name that CMake has determined via CPACK_TEMPORARY_PACKAGE_FILE_NAME or CPACK_PACKAGE_FILE_NAME. So reset the CMake-determined list to match what libpkg will do.
| * | | | FreeBSD: migrate to newer pkg_create(3) APIAdriaan de Groot2021-12-211-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pkg_create_from_manifest() function was never really intended as stable API, and bapt@ has asked me to stop using it so the public API can be stabilized. Port to pkg_create() with its attendant settings struct. Since we already have a complete manifest file, we can hand that (including the embedded plist) to pkg_create(). While here, reintroduce pkg_init(), which lived in downstream patches for a while and then went away again.
* | | | | Merge topic 'doc-list-non-existent'Brad King2021-12-223-3/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b573a732dc Tests: add tests to check claims in the documentation b151db01f9 Help: mention non-existent case for list(PREPEND) b3a249c2cb Help: clarify range for list(INSERT), mention nonexistent / empty case b6fdcb3df0 Help: clarify description of list(INSERT) e55f473ea9 Help: clarify that list(APPEND) on a non-existent list creates it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6824
| * | | | | Tests: add tests to check claims in the documentationAdriaan de Groot2021-12-212-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - list commands APPEND, PREPEND, INSERT treat non-existent lists as empty and use that value, creating a new list variable in the process.
| * | | | | Help: mention non-existent case for list(PREPEND)Adriaan de Groot2021-12-211-1/+3
| | | | | |
| * | | | | Help: clarify range for list(INSERT), mention nonexistent / empty caseAdriaan de Groot2021-12-211-1/+6
| | | | | |
| * | | | | Help: clarify description of list(INSERT)Adriaan de Groot2021-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since the argument is called 'index', use that in the description.
| * | | | | Help: clarify that list(APPEND) on a non-existent list creates itAdriaan de Groot2021-12-211-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is hinted-at in the introduction, which mentions creating a new variable value in the current scope, but let's make it explicit. Fixes: #22910