mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 20:21:41 -06:00
Code Issues Packages Projects Releases Wiki Activity
57,193 Commits 2 Branches 390 Tags
313ea361b0435b18e89fb652bf59a8aef25a066b
Commit Graph

5943 Commits

Author SHA1 Message Date
Brad King
7fc013a922 Merge topic 'rel-macos-dmg-no-sla' 
2167fce99b Utilities/Release: Drop SLA from CMake macOS DMG package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7192
 2022-04-21 12:08:31 -04:00
Brad King
a0601e346b Merge topic 'find_package_document_global_in_full_signature' 
b3e1fcf20a Help: Clarify that find_package GLOBAL argument is supported in full signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7180
 2022-04-21 11:51:39 -04:00
Brad King
2167fce99b Utilities/Release: Drop SLA from CMake macOS DMG package 
macOS 12 deprecates the tools needed to attach a SLA to a `.dmg`.
CMake 3.23 added `CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE` to
control whether `CPACK_RESOURCE_FILE_LICENSE` is used as the SLA.
CMake 3.24 will add policy CMP0133 to disable the SLA by default.

Explicitly turn off the SLA for CMake's official macOS binaries.
This will allow them to build on future macOS versions that have
no SLA tooling available.

Issue: #22978
 2022-04-20 13:27:39 -04:00
Robert Maynard
b3e1fcf20a Help: Clarify that find_package GLOBAL argument is supported in full signature 
This was accidentally left out of the docs by commit 2f1ffa003c
(find_package: Add support for default GLOBAL imported targets,
2022-03-10).
 2022-04-20 12:38:56 -04:00
Brad King
722e4d4619 Merge topic 'cpack-dmg-sla' 
b760828d3f CPack/DMG: Do not use CPACK_RESOURCE_FILE_LICENSE for SLA by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7176
 2022-04-20 11:38:15 -04:00
Brad King
ac68695b94 Merge topic 'vs-dotnet-startup-object' 
d89af11f89 VS: Add StartupObject property for managed .NET projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7171
 2022-04-20 11:35:03 -04:00
Brad King
bfefcd5734 Merge topic 'target-runtime-dlls-doc' 
692aacfc72 Help: Remove references to MODULE in $<TARGET_RUNTIME_DLLS> doc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7186
 2022-04-20 11:29:10 -04:00
Kyle Edwards
692aacfc72 Help: Remove references to MODULE in $<TARGET_RUNTIME_DLLS> doc 2022-04-19 12:45:22 -04:00
Brad King
1cf59d5267 Merge topic 'file-set-generated-dependency' 
d0d09aa29f FILE_SET: Make INTERFACE libraries with HEADER_SETS participate in buildsystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Gabriel Nützi <gnuetzi@gmail.com>
Merge-request: !7173
 2022-04-15 08:23:57 -04:00
Brad King
b760828d3f CPack/DMG: Do not use CPACK_RESOURCE_FILE_LICENSE for SLA by default 
Since macOS 12.0 deprecated the tools needed to attach a SLA to a
`.dmg`, we should no longer do this by default.  Add a policy to
change the default to off.

Fixes: #22978
 2022-04-14 10:14:58 -04:00
Brad King
0cfd557883 Merge topic 'cmake_host_system_information-query-windows-registry' 
17ff86547e cmake_host_system_information: query windows registry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7155
 2022-04-14 09:26:20 -04:00
Kyle Edwards
d0d09aa29f FILE_SET: Make INTERFACE libraries with HEADER_SETS participate in buildsystem 
If an INTERFACE library has HEADER_SETS, and its header sets contain
files generated by a custom command, the library needs to participate in
the buildsystem so that the files will be generated.

Fixes: #23422
 2022-04-14 09:17:54 -04:00
Marc Chevrier
17ff86547e cmake_host_system_information: query windows registry 
Fixes: #21240, #23367
 2022-04-13 08:59:08 -04:00
Brad King
f6476ba3a6 Merge topic 'file-set-repr-improvements' 
5fa15ec9f3 Help: Document that target_sources defines [INTERFACE_]HEADER_SETS
c5d4812f20 cmTarget: make HEADER_SETS and INTERFACE_HEADER_SETS read-only
05783b168d cmFileSet: store visibility with the fileset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7168
 2022-04-12 10:05:26 -04:00
Brad King
56a11b2f64 Merge topic 'file-set-repr-improvements' into release-3.23 
5fa15ec9f3 Help: Document that target_sources defines [INTERFACE_]HEADER_SETS
c5d4812f20 cmTarget: make HEADER_SETS and INTERFACE_HEADER_SETS read-only
05783b168d cmFileSet: store visibility with the fileset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7168
 2022-04-12 10:05:25 -04:00
Brad King
22563164a8 Merge branch 'release-3.22' into release-3.23 2022-04-12 09:50:19 -04:00
Brad King
e3e12e76f4 Merge branch 'release-3.22' 2022-04-12 09:49:53 -04:00
Florian Schweiger
d89af11f89 VS: Add StartupObject property for managed .NET projects 2022-04-12 15:35:17 +02:00
Brad King
07d351b535 CMake 3.22.4 2022-04-12 09:06:27 -04:00
Brad King
5fa15ec9f3 Help: Document that target_sources defines [INTERFACE_]HEADER_SETS 2022-04-12 08:47:45 -04:00
Ben Boeckel
c5d4812f20 cmTarget: make HEADER_SETS and INTERFACE_HEADER_SETS read-only 
There is no reason to allow these properties to be manipulated by user
code. Instead, use the stored visibility on the fileset objects to
derive what these properties should contain.
 2022-04-11 14:06:15 -04:00
Brad King
de6038aaf4 Merge branch 'doc-qhelpgenerator' into release-3.23 
Merge-request: !7150
 2022-04-08 08:52:55 -04:00
Brad King
261b29bccc Merge topic 'doc-qhelpgenerator' 
bf69fa32c4 Utilities/Sphinx: Update qthelp generation to qhelpgenerator
37904abb58 Help: Add "Updates" section header in 3.22 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7150
 2022-04-08 08:51:22 -04:00
Brad King
9a7d8394b1 Merge topic 'header-sets-no-framework' 
f779f8c0ad FILE_SET: Forbid adding header sets to Apple FRAMEWORK libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !7149
 2022-04-07 10:54:30 -04:00
Brad King
37904abb58 Help: Add "Updates" section header in 3.22 release notes 
This was accidentally left out in commit 1461eff899 (Help: Add missing
3.22.1 section to the release notes, 2022-01-24, v3.22.2~1^2).
 2022-04-07 09:33:03 -04:00
Kyle Edwards
f779f8c0ad FILE_SET: Forbid adding header sets to Apple FRAMEWORK libraries 
The feature needs a specialized implementation to place headers
in the right place inside frameworks.  To avoid silently doing
the wrong thing, make this case an error for the 3.23 series.

Issue: #23386
 2022-04-07 09:26:58 -04:00
Brad King
c8f912fa59 Merge topic 'FindJNI-targets' 
00c4f488f2 FindJNI: support Android NDK
171d45c039 FindJNI: added components and imported targets
35e92ec619 FindJNI: improved description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !7069
 2022-04-07 09:11:56 -04:00
Brad King
c508935dad Merge topic 'adsp-platform-and-compilers' 
87142bbd5f ADSP: Add dedicated platform module
e9eabb0dcd ADSP: Configure compiler in compiler module
88b38f531a ADSP: Support both VDSP++ and CCES for ADSP compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7123
 2022-04-06 12:04:43 -04:00
Brad King
2b4081660c Merge topic 'FindMatlab-no-implicit-link' 
178cf34bdc FindMatlab: Add NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES option to matlab_add_mex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7139
 2022-04-06 12:03:04 -04:00
Silvio
178cf34bdc FindMatlab: Add NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES option to matlab_add_mex 2022-04-05 08:27:09 -04:00
Brad King
eea53ea0a9 Merge topic 'xcode-xcconfig' 
53ca6edd8a xcode: add support for xcconfig files
183b6bbf51 Tests: Ignore all classes in Xcode internal objc warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7119
 2022-04-05 08:24:28 -04:00
Sergiu Deitsch
171d45c039 FindJNI: added components and imported targets 2022-04-04 19:46:32 +02: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
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
Chris Wright
87142bbd5f ADSP: Add dedicated platform module 2022-04-04 17:05:09 +01:00
Chris Wright
e9eabb0dcd ADSP: Configure compiler in compiler module 2022-04-04 16:56:47 +01:00
Chris Wright
88b38f531a ADSP: Support both VDSP++ and CCES for ADSP compilers 2022-04-04 16:56:47 +01: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
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
Eugene Shalygin
7431759ebc Help: Fix typo in install command documentation 2022-04-04 07:38:29 +10:00
Gregor Jasny
53ca6edd8a xcode: add support for xcconfig files 
Fixes: #18420
 2022-04-03 22:39:34 +02:00
Brad King
9993774172 Help: Clarify when policy CMP0112 takes effect 
Fixes: #23381
 2022-04-01 10:06:04 -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
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
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
Tobias Nießen
cf4100d7da Help: Add that CMAKE_CACHEFILE_DIR might not be defined 
CMake only sets `CMAKE_CACHEFILE_DIR` when writing `CMakeCache.txt`,
so the variable will usually be undefined when `CMakeLists.txt` runs.
Revise its documentation to clarify that `CMAKE_BINARY_DIR` should
be used instead.
 2022-03-30 09:20:18 -04:00
Tobias Nießen
2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature 
The list of indices and/or member names is optional, i.e., can be
empty. For example, string(JSON foo LENGTH "[0,0,0]") sets foo to 3.
 2022-03-30 09:14:13 -04:00