summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge topic 'cmake-presets-include-outside-project-dir'Brad King2022-01-203-29/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c2d234bc9 CMakePresets: Allow files included from CMakePresets.json to be anywhere Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com> Merge-request: !6867
| * | | | | | | CMakePresets: Allow files included from CMakePresets.json to be anywhereKyle Edwards2022-01-193-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some valid use cases for allowing these files to be outside the project directory. Relax the restriction, and include a strong warning in the documentation.
* | | | | | | | CMake Nightly Date StampKitware Robot2022-01-201-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'cpack-dmg-sla'Brad King2022-01-191-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e38bfa915 CPack/DMG: Add explicit option to use CPACK_RESOURCE_FILE_LICENSE for SLA 542ba6ac1a Tests: Add CPack/DMG case covering SLA from CPACK_RESOURCE_FILE_LICENSE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6876
| * | | | | | | CPack/DMG: Add explicit option to use CPACK_RESOURCE_FILE_LICENSE for SLABrad King2022-01-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since macOS 12.0, the ``hdiutil udifrez`` and ``hdiutil udifderez`` commands to embed and extract resources in a disk image are deprecated. The CPack DragNDrop Generator uses these to attach the SLA specified by the `CPACK_RESOURCE_FILE_LICENSE` option. Since that option is shared by multiple CPack generators, we cannot deprecate it. Instead, add an explicit option to control the behavior. This will give projects a way to package on future macOS versions that remove the commands. In order to provide a long-term transition away from attaching SLAs to disk images, update `cpack` to default this behavior to OFF. To retain compatibility for CMake projects, teach the CPack module to default the option to ON. Later a policy can be added to change the default. Issue: #22978
* | | | | | | | Merge topic 'define-property-optional-args'Brad King2022-01-192-44/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edb5059216 define_property(): Make BRIEF_DOCS and FULL_DOCS optional 7d26baff46 cmDefinePropertyCommand: Refactor to use cmArgumentParser Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6875
| * | | | | | | | define_property(): Make BRIEF_DOCS and FULL_DOCS optionalKyle Edwards2022-01-182-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20698
| * | | | | | | | cmDefinePropertyCommand: Refactor to use cmArgumentParserKyle Edwards2022-01-181-32/+21
| |/ / / / / / /
* | | | | | | | Merge topic 'handle_multiple_source_dirs'Brad King2022-01-191-28/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2bc3364f0 CMake: `-S` paths preferred over other provided paths 2e1b7e5b9a Add tests that showcase cmake -S limitations Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6874
| * | | | | | | | CMake: `-S` paths preferred over other provided pathsRobert Maynard2022-01-181-28/+26
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cmake parses `cmake -S <path> <path>` treat the second path as the build directory. Likwise when invoked with `<path> -S <path>` treat the first path as the build path instead of using the current working directory.
* | | | | | | | Merge topic 'depfile-parsing-update'Brad King2022-01-196-84/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b65a2b253 add_custom_command(DEPFILE): ensure all dependencies are taken into account e04a352cca Depfile parsing: enhance compatibility with GNU Make Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6861
| * | | | | | | | add_custom_command(DEPFILE): ensure all dependencies are taken into accountMarc Chevrier2022-01-163-30/+36
| | | | | | | | |
| * | | | | | | | Depfile parsing: enhance compatibility with GNU MakeMarc Chevrier2022-01-163-54/+79
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-01-191-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2022-01-181-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2022-01-171-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2022-01-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2022-01-151-1/+1
|/ / / / / /
* | | | | | Merge topic 'fix_file_offset'Brad King2022-01-141-14/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd0c285b12 file: Fix types of the OFFSET and LIMIT arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6839
| * | | | | | file: Fix types of the OFFSET and LIMIT argumentsAlexey Edelev2022-01-131-14/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OFFSET argument cannot handle offsets bigger than INT_MAX because of the atoi function, which is used to convert the argument string to integer. Same applies for the LIMIT argument. Use the steam based reading and 64-bit types to convert and store arguments to avoid invalid values stored in the corresponding variables. Fixes: #23076
* | | | | | CMake Nightly Date StampKitware Robot2022-01-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-01-131-1/+1
|/ / / / /
* | | | | Merge topic 'better_error_message_on_unsupported_language_level'Brad King2022-01-121-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec1e40af1a cmStandardLevelResolver: Better error message on unsupported language level Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6854
| * | | | | cmStandardLevelResolver: Better error message on unsupported language levelRobert Maynard2022-01-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #23079
* | | | | | Merge topic 'file-READ_ELF-capture-error'Brad King2022-01-121-3/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41bebbe50a file: Restore error capture in undocumented READ_ELF mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6853
| * | | | | file: Restore error capture in undocumented READ_ELF modeBrad King2022-01-111-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the error message added by commit 115ff6a347 (cmELF: Include the ELF parsing code unconditionally, 2021-06-17, v3.22.0-rc1~557^2) to honor the `CAPTURE_ERROR` option. This is needed by the call site in `BundleUtilities` to suppress errors on non-ELF files. Fixes: #23074
| * | | | | CMake 3.22.1v3.22.1Brad King2021-12-071-1/+1
| | | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2022-01-125-25/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d37dae5f9 cmFileCommand: Update for new signature of GetLineFromStream f52dac56a0 Merge branch 'upstream-KWSys' into update-kwsys 6e8a2de4cb KWSys 2022-01-11 (15b0b0c4) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6852
| * | | | | | cmFileCommand: Update for new signature of GetLineFromStreamBrad King2022-01-111-6/+4
| | | | | | |
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-01-114-19/+23
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-01-11 (15b0b0c4)
* | | | | | CMake Nightly Date StampKitware Robot2022-01-121-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2022-01-111-1/+1
| | | | |
* | | | | Merge topic 'cmake-presets-include'Brad King2022-01-1018-1326/+1697
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a5512c0f CMakePresets: Add include field a239f23a98 Refactor: Generalize file graph in CMakePresets 84d440caac Refactor: Split JSON processing into configure, build, and test presets fd6ea2f67f Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraph Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6829
| * | | | CMakePresets: Add include fieldKyle Edwards2022-01-073-3/+66
| | | | | | | | | | | | | | | | | | | | Fixes: #21331
| * | | | Refactor: Generalize file graph in CMakePresetsKyle Edwards2022-01-073-28/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2022-01-101-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-01-091-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-01-081-1/+1
| | | | |
* | | | | Merge topic 'refactor_vsproject_type'Brad King2022-01-077-47/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b7520b94d Consolidate usage of VsProjectType 938a53f4f1 Refactor VsProjectType to its own header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6830
| * | | | | Consolidate usage of VsProjectTypeSumit Bhardwaj2021-12-234-42/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move ProjectFileExtension handling logic to use ProjectType and remove extraneous checks in .Net SDK style project generation. This change will make introducing new project types relatively simpler.
| * | | | | Refactor VsProjectType to its own headerSumit Bhardwaj2021-12-233-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move VsProject to its own header so that we can consolidate IsManaged and IsCSharp.
* | | | | | Merge topic 'cpack-pkg-domains'Brad King2022-01-072-1/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da737d34e0 CPack/productbuild: add options to control domains element Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6825
| * | | | | | CPack/productbuild: add options to control domains elementDavid Wosk2022-01-062-1/+40
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The domains element determines the required authorization level needed for the install. The auth attribute of the pkg-ref element has been deprecated in favor of domains, so if the domains options are specified, the auth attribute is omitted. Fixes: #23030
* | | | | | CMake Nightly Date StampKitware Robot2022-01-071-1/+1
|/ / / / /
* | | | | Merge topic 'xcode-framework-system-includes'Brad King2022-01-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |