Commit Graph

57006 Commits

Author SHA1 Message Date
Brad King 84ff365062 Merge branch 'release-3.23' 2022-04-04 13:42:16 -04:00
Brad King c4c02a8b3d Merge branch 'release-3.22' 2022-04-04 13:42:14 -04:00
Brad King e2eae982c6 Merge branch 'release-3.22' into release-3.23 2022-04-04 13:42:10 -04:00
Brad King 3e94369c25 Merge branch 'release-3.23' 2022-04-04 13:41:28 -04:00
Brad King ffe699217c Merge topic 'ci-package-uploads'
b20a19fca1 Merge branch 'backport-3.22-ci-package-uploads' into ci-package-uploads
cb44e0d47c gitlab-ci: distinguish release and development pipeline schedules
3a9a9a3ace gitlab-ci: clarify name of package upload job template

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7142
2022-04-04 13:41:28 -04:00
Brad King 1838558ce4 Merge topic 'ci-package-uploads' into release-3.23
b20a19fca1 Merge branch 'backport-3.22-ci-package-uploads' into ci-package-uploads
cb44e0d47c gitlab-ci: distinguish release and development pipeline schedules
3a9a9a3ace gitlab-ci: clarify name of package upload job template

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7142
2022-04-04 13:41:27 -04:00
Brad King 95888cde01 Merge branch 'backport-3.22-ci-package-uploads' into release-3.22
Merge-request: !7142
2022-04-04 13:39:31 -04:00
Brad King b20a19fca1 Merge branch 'backport-3.22-ci-package-uploads' into ci-package-uploads 2022-04-04 13:26:19 -04:00
Brad King cb44e0d47c gitlab-ci: distinguish release and development pipeline schedules
Redefine the `CMAKE_CI_PACKAGE` pipeline schedule variable to
indicate whether it is for a development version (`dev`) or a
release version (`v[0-9]...`).  Use this to automatically turn
package upload jobs on or off without having to edit the jobs
in `.gitlab-ci.yml` for release branches.
2022-04-04 13:23:37 -04:00
Brad King 3a9a9a3ace gitlab-ci: clarify name of package upload job template
The template is used to upload both source and binary packages.
2022-04-04 13:23:35 -04:00
Brad King 34cb46dd6e Merge topic 'const-stack'
11cc728e75 cmConstStack: Factor out of cmListFileBacktrace
9123193758 cmListFileBacktrace: Clarify call sites that only push a file path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7135
2022-04-04 09:33:34 -04:00
Brad King 1dbd4e9a41 Merge topic 'export-out-of-dir-TARGET_NAME'
6d34cc3cb8 export: Fix TARGET_NAME lookup for out-of-dir linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7136
2022-04-04 09:32:52 -04:00
Brad King bcc3584912 Merge topic 'vs-FI-space'
20cd951c9f VS: Add compiler flag table entry for -FI followed by separate argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7138
2022-04-04 09:31:55 -04:00
Brad King 788171a3c0 Merge branch 'release-3.23' 2022-04-04 09:26:58 -04:00
Brad King c7a1ccece9 Merge topic 'doc-CMP0112'
9993774172 Help: Clarify when policy CMP0112 takes effect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7134
2022-04-04 09:26:58 -04:00
Brad King 7260208379 Merge topic 'doc-CMP0112' into release-3.23
9993774172 Help: Clarify when policy CMP0112 takes effect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7134
2022-04-04 09:26:57 -04:00
Craig Scott 8ef33eb033 Merge branch 'release-3.23' 2022-04-04 07:46:55 -04:00
Craig Scott ce121e486c Merge topic 'doc-install-typo'
7431759ebc Help: Fix typo in install command documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7140
2022-04-04 07:46:55 -04:00
Craig Scott 96293e3336 Merge topic 'doc-install-typo' into release-3.23
7431759ebc Help: Fix typo in install command documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7140
2022-04-04 07:46:54 -04:00
Kitware Robot fd46a557c8 CMake Nightly Date Stamp 2022-04-04 00:02:47 -04:00
Eugene Shalygin 7431759ebc Help: Fix typo in install command documentation 2022-04-04 07:38:29 +10:00
Kitware Robot fff8f3bee9 CMake Nightly Date Stamp 2022-04-03 00:01:09 -04:00
Brad King 11cc728e75 cmConstStack: Factor out of cmListFileBacktrace
This presents value semantics for a stack of constant values.
Internally it shares ownership to avoid copies.  Previously
this was implemented by `cmListFileBacktrace` explicitly,
but the approach can be re-used for other kinds of stacks.
2022-04-02 05:55:31 -04:00
Kitware Robot 6733ad4dd5 CMake Nightly Date Stamp 2022-04-02 00:01:21 -04:00
Brad King 20cd951c9f VS: Add compiler flag table entry for -FI followed by separate argument
The MSVC `/FI` flag accepts an attached value or a following argument.
Previously our flag tables only had entries for the former.  Add
the latter.

Fixes: #23382
2022-04-01 16:37:08 -04:00
Brad King 6d34cc3cb8 export: Fix TARGET_NAME lookup for out-of-dir linking
Improve the logic added by commit f0e67da061 (target_link_libraries: Fix
out-of-dir linking of a list of targets, 2020-01-14, v3.17.0-rc1~149^2)
to, while exporting targets, look up referenced target names in the
correct directory.
2022-04-01 13:59:51 -04:00
Brad King 9123193758 cmListFileBacktrace: Clarify call sites that only push a file path
This removes the last part of the `cmListFileBacktrace` interface
that needs to know the type of data in its stack.
2022-04-01 10:18:46 -04:00
Brad King 9993774172 Help: Clarify when policy CMP0112 takes effect
Fixes: #23381
2022-04-01 10:06:04 -04:00
Craig Scott 6e1be5dbef Merge topic 'doc-CMAKE_USER_MAKE_RULES_OVERRIDE'
b1c502ff94 Help: Add missing cross-reference in CMAKE_USER_MAKE_RULES_OVERRIDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7133
2022-04-01 06:08:30 -04:00
Kitware Robot 86cee7a383 CMake Nightly Date Stamp 2022-04-01 00:01:21 -04:00
Craig Scott b1c502ff94 Help: Add missing cross-reference in CMAKE_USER_MAKE_RULES_OVERRIDE
The language-specific variable references the general one already,
but the general one did not mention the language-specific one.
Add that cross reference to improve discoverability.
2022-04-01 08:22:40 +11:00
Brad King 63d5c8a3a8 Merge topic 'quiet_pkg-config'
99f7d1973c FindGSL: Quiet pkg-config errors
655582e931 FindLAPACK: Quiet pkg-config errors
6dab35e25d FindBLAS: Quiet pkg-config errors
b2a7f73b55 FindGLUT: Quiet pkg-config errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7128
2022-03-31 08:53:01 -04:00
Brad King 7ae3c6740b Merge topic 'string-JSON-error-modes'
93dce4b4bf string(JSON): fix error message on invalid mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7130
2022-03-31 08:52:04 -04:00
Brad King 840fb95904 Merge branch 'release-3.23' 2022-03-31 08:50:25 -04:00
Brad King ad3c50e0b4 Merge topic 'GNUInstallDirs-revert-multiarch-prefixes'
624ec3692f GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR to more prefixes"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7127
2022-03-31 08:50:25 -04:00
Brad King 99fc8f152c Merge topic 'GNUInstallDirs-revert-multiarch-prefixes' into release-3.23
624ec3692f GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR to more prefixes"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7127
2022-03-31 08:50:24 -04:00
Brad King 8a00633af5 Merge branch 'release-3.23' 2022-03-31 08:49:06 -04:00
Brad King 4c5c9291bc Merge topic 'help-variables-cmakecachefiledir-might-not-be-defined'
cf4100d7da Help: Add that CMAKE_CACHEFILE_DIR might not be defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7125
2022-03-31 08:49:06 -04:00
Brad King bc1cde42d4 Merge topic 'help-variables-cmakecachefiledir-might-not-be-defined' into release-3.23
cf4100d7da Help: Add that CMAKE_CACHEFILE_DIR might not be defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7125
2022-03-31 08:49:05 -04:00
Brad King a3cc30c350 Merge branch 'release-3.23' 2022-03-31 08:48:19 -04:00
Brad King 025b86cc17 Merge topic 'help-json-length-empty-index'
2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7126
2022-03-31 08:48:18 -04:00
Brad King 816151c118 Merge topic 'help-json-length-empty-index' into release-3.23
2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7126
2022-03-31 08:48:17 -04:00
Brad King 27a1002ee8 Merge branch 'release-3.23' 2022-03-31 08:47:25 -04:00
Brad King 8ef1fffa45 Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables'
f7c6b9833c CUDA: Ninja generator generates valid compile database

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7129
2022-03-31 08:47:25 -04:00
Brad King e5cda4c772 Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables' into release-3.23
f7c6b9833c CUDA: Ninja generator generates valid compile database

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7129
2022-03-31 08:47:24 -04:00
Brad King f9215a42ba Merge branch 'release-3.23' 2022-03-31 08:46:29 -04:00
Brad King 2657454b59 Merge topic 'CMakeDependentOption-doc-improvement'
7a614977f9 CMakeDependentOption: improve documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rui Oliveira <ruimail24@gmail.com>
Merge-request: !7124
2022-03-31 08:46:29 -04:00
Brad King cc75519e5d Merge topic 'CMakeDependentOption-doc-improvement' into release-3.23
7a614977f9 CMakeDependentOption: improve documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rui Oliveira <ruimail24@gmail.com>
Merge-request: !7124
2022-03-31 08:46:28 -04:00
Kitware Robot 6f132d6c91 CMake Nightly Date Stamp 2022-03-31 00:01:20 -04:00
Ben Boeckel 7a614977f9 CMakeDependentOption: improve documentation
This makes it far clearer that `<depends>` is a list up front instead of
burying the lede because a list is generally "trivially true" in CMake[1].
Also clarify that `<force>` is only available as a local variable and if
queried outside of the "scope" of the `cmake_dependent_option` call,
will get the stored user cache value.

[1] The exception being when the last entry ends in `-NOTFOUND`.

Suggested-by: Rui Oliveira
2022-03-30 16:05:37 -04:00