Commit Graph

55111 Commits

Author SHA1 Message Date
Brad King 22ab2488c9 Merge topic 'doc-configure_file-creates-directories'
fa47e9c8f9 Help: Document that configure_file can create directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6675
2021-10-29 08:51:24 -04:00
Kitware Robot 83aeec6015 CMake Nightly Date Stamp 2021-10-29 00:02:01 -04:00
Marc Aldorasi fa47e9c8f9 Help: Document that configure_file can create directories 2021-10-28 12:48:25 -04:00
Brad King 15d3e20cac Merge branch 'release-3.22' 2021-10-28 10:37:16 -04:00
Brad King 51e9d93c9c Merge topic 'target-sources-file-set'
a7c71b9f03 Tests: Add tests for target_sources(FILE_SET) and associated functionality
4b0ee4e338 Help: Add documentation for target_sources(FILE_SET) and associated properties
3c3698b0e4 FileAPI: Add information on file set installers
8a09723bff cmGeneratorTarget: Integrate file sets into calculated sources
2a78d47b16 install(EXPORT): Install file sets
9b479124cc install(TARGETS): Add FILE_SET mode
d8af2d954f target_sources(): Add FILE_SET mode
f2bd022468 cmTargetSources: Refactor to add enum class parameters
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6653
2021-10-28 09:58:13 -04:00
Brad King 28a033cc7d CMake 3.22.0-rc2 v3.22.0-rc2 2021-10-28 09:46:08 -04:00
Brad King a3791b24c9 Merge topic 'vulkan-version-support'
caeaabb356 FindVulkan: Add version support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6669
2021-10-28 09:16:03 -04:00
Brad King f66eb3addd Merge topic 'update-kwsys'
848eeba483 Merge branch 'upstream-KWSys' into update-kwsys
6015a898d4 KWSys 2021-10-27 (e19a5668)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6670
2021-10-28 09:15:17 -04:00
Brad King c1427ba337 Merge branch 'release-3.22' 2021-10-28 09:14:06 -04:00
Brad King 8469ba6fcf Merge topic 'cpack-qtifw-4.2'
51a2afe6e7 CPack/IFW: Add support for QtIFW 4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6674
2021-10-28 09:14:06 -04:00
Brad King 639d72776c Merge topic 'cpack-qtifw-4.2' into release-3.22
51a2afe6e7 CPack/IFW: Add support for QtIFW 4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6674
2021-10-28 09:14:05 -04:00
Brad King 811672a865 Merge branch 'release-3.22' 2021-10-28 09:09:25 -04:00
Brad King 3055b202ec Merge topic 'builtin-help-versionadded'
054754359a cmRST: support `versionadded` and `versionchanged` directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6667
2021-10-28 09:09:24 -04:00
Brad King 7b19f55003 Merge topic 'builtin-help-versionadded' into release-3.22
054754359a cmRST: support `versionadded` and `versionchanged` directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6667
2021-10-28 09:09:23 -04:00
Kitware Robot f186934161 CMake Nightly Date Stamp 2021-10-28 00:02:13 -04:00
Kyle Edwards a7c71b9f03 Tests: Add tests for target_sources(FILE_SET) and associated functionality 2021-10-27 15:17:23 -04:00
Kyle Edwards 4b0ee4e338 Help: Add documentation for target_sources(FILE_SET) and associated properties 2021-10-27 15:17:23 -04:00
Kyle Edwards 3c3698b0e4 FileAPI: Add information on file set installers 2021-10-27 15:17:23 -04:00
Kyle Edwards 8a09723bff cmGeneratorTarget: Integrate file sets into calculated sources 2021-10-27 15:17:23 -04:00
Kyle Edwards 2a78d47b16 install(EXPORT): Install file sets 2021-10-27 15:17:23 -04:00
Kyle Edwards 9b479124cc install(TARGETS): Add FILE_SET mode 2021-10-27 15:17:23 -04:00
Kyle Edwards d8af2d954f target_sources(): Add FILE_SET mode 2021-10-27 15:17:23 -04:00
Kyle Edwards f2bd022468 cmTargetSources: Refactor to add enum class parameters 2021-10-27 15:17:23 -04:00
Kyle Edwards f2a44a8afa cmTarget: Add cmFileSet and associated properties 2021-10-27 15:17:23 -04:00
Ralf Habacker caeaabb356 FindVulkan: Add version support
The version is constructed in the form <major>.<minor>.<patch> e.g.
1.2.189.
2021-10-27 20:50:55 +02:00
Brad King 472bdf5c8d Merge branch 'release-3.22' 2021-10-27 14:49:47 -04:00
Brad King eeb8391fd6 Merge topic 'ci-scheduled'
ada9855b78 gitlab-ci: Run manual jobs automatically only on scheduled pipelines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6671
2021-10-27 14:49:46 -04:00
Brad King db8ee19317 Merge topic 'ci-scheduled' into release-3.22
ada9855b78 gitlab-ci: Run manual jobs automatically only on scheduled pipelines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6671
2021-10-27 14:49:45 -04:00
Erlend E. Aasland 51a2afe6e7 CPack/IFW: Add support for QtIFW 4.2 2021-10-27 14:31:22 -04:00
Brad King ada9855b78 gitlab-ci: Run manual jobs automatically only on scheduled pipelines
Previously we ran manual jobs automatically in the `cmake/cmake`
project integration branches.  Change this to happen only when
the pipeline is created by a schedule.

Also, start automatic jobs in scheduled pipelines without delay.
2021-10-27 13:30:20 -04:00
Kyle Edwards 447fbf061a EscapeForCMake: Add wrapQuotes parameter 2021-10-27 13:27:02 -04:00
Brad King 848eeba483 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-10-27 (e19a5668)
2021-10-27 11:21:46 -04:00
KWSys Upstream 6015a898d4 KWSys 2021-10-27 (e19a5668)
Code extracted from:

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

at commit e19a5668f01bb9d96440ce96e777749d6e92562d (e19a5668f01bb9d96440ce96e777749d6e92562d).

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

Mathieu Westphal (1):
      e28d7282 DynamicLoader: Add RTLD_GLOBAL as a supported flag on linux

Sean McBride (8):
      704a63d4 Replace sprintf with snprintf
      f9f6d67b Replace non-standard _snprintf with standard snprintf
      f771c009 Fix -Wunused-macros warning by defining under same conditions as usage
      f3d4b12b Fix Wmissing-prototypes warnings by making functions static
      6f4a1826 Fix Wmissing-variable-declarations by declaring variable in a header
      31d25023 Fix all Wold-style-cast warnings
      0f44b620 Fix Wreserved-id-macro warning by removing double underscore
      44718539 Fix for extraneous semi-colon warning
2021-10-27 11:21:46 -04:00
Brad King af6414c6c5 Merge branch 'release-3.22' 2021-10-27 10:42:12 -04:00
Brad King 70024a4cf5 Merge branch 'release-3.21' into release-3.22 2021-10-27 10:41:58 -04:00
Brad King 3a3b7589ff Merge branch 'release-3.21' 2021-10-27 10:41:23 -04:00
Brad King f65cebf51a CMake 3.21.4 v3.21.4 2021-10-27 09:51:39 -04:00
Brad King a956be4847 Merge topic 'warnings-cleanup'
7e4e192ce2 Source: fix clang-tidy modernize-redundant-void-arg warning
8d671dd94c Source: fix more -Wmissing-prototypes warnings
1cf14f8c03 Source: fix many -Wmissing-prototypes warnings by marking functions static
319944b3d2 Source: fix some -Wunused-macros warnings
5257d9e71a Source: fix only -Wshorten-64-to-32 warning with explicit cast

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6648
2021-10-27 09:24:54 -04:00
Brad King db422ae0c7 Merge topic 'more-rule-of-3'
8f8f73712a Source: fix more rule of 3 warnings from clang -Wdeprecated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6659
2021-10-27 09:24:01 -04:00
Brad King 9bb7982a15 Merge topic 'purge-sprintf'
b7e9cd05cd Replace the only non-standard _snprintf with snprintf
5ba6e8ac59 Source: Replace most calls to sprintf with snprintf

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6649
2021-10-27 09:23:17 -04:00
Brad King ede11598ba Merge topic 'simplify-boolean-expressions'
dd918c517d Source: Simplify some boolean expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6654
2021-10-27 09:22:04 -04:00
Brad King b20faa9781 Merge branch 'release-3.22' 2021-10-27 09:20:46 -04:00
Brad King b33c67a6f7 Merge topic 'envmod-support-mod-to-new-variables'
69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6663
2021-10-27 09:20:46 -04:00
Brad King 964af18dc1 Merge topic 'envmod-support-mod-to-new-variables' into release-3.22
69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6663
2021-10-27 09:20:45 -04:00
Brad King 7059b9dc5f Merge branch 'release-3.22' 2021-10-27 09:19:54 -04:00
Brad King 458b30ce40 Merge topic 'vs-instance-repeat'
9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6665
2021-10-27 09:19:54 -04:00
Brad King 550c259819 Merge topic 'vs-instance-repeat' into release-3.22
9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6665
2021-10-27 09:19:53 -04:00
Brad King e945637078 Merge branch 'release-3.22' 2021-10-27 09:18:57 -04:00
Brad King b229c156b2 Merge topic 'doc-ENVIRONMENT_MODIFICATION'
f6177f05da Help: Clarify ENVIRONMENT_MODIFICATION case sensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6661
2021-10-27 09:18:57 -04:00
Brad King 31d49d613a Merge topic 'doc-ENVIRONMENT_MODIFICATION' into release-3.22
f6177f05da Help: Clarify ENVIRONMENT_MODIFICATION case sensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6661
2021-10-27 09:18:56 -04:00