mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 06:40:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
55,167 Commits 2 Branches 401 Tags
4e84a4763d702590fb06d62540e35a614dcd5133
Commit Graph

31539 Commits

Author SHA1 Message Date
Brad King 4e84a4763d Merge topic 'support_nvcc_native_flag' 
14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6652
 2021-11-02 08:55:13 -04:00
Brad King 3b1f23b789 Merge topic 'update-kwsys' 
37c2f722fc find_program: Explicitly skip WindowsApps/python*.exe app installer links
d8b5b0c7e4 Merge branch 'upstream-KWSys' into update-kwsys
e9ab6eeeb5 KWSys 2021-11-01 (572f2a65)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6679
 2021-11-02 08:51:34 -04:00
Kitware Robot fed54aa362 CMake Nightly Date Stamp 2021-11-02 00:02:10 -04:00
Brad King e06f186c20 Merge topic 'vs-instance' 
195d47e213 VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instance
ec8d37b3b1 VS: Support version specification in CMAKE_GENERATOR_INSTANCE
8e6d930e8c VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCE
5d1f377737 cmVSSetupHelper: Factor out helper to load MSVC toolset version
006fe1e919 cmVSSetupHelper: Convert wide to narrow strings early
f5dfc788b8 cmVSSetupHelper: Drop unused InstanceId field
3213e2595d cmVSSetupHelper: Drop unused ullVersion field
152f9978dd Help: De-duplicate VS instance selection documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6651
 2021-11-01 16:24:54 -04:00
Robert Maynard 14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags 2021-11-01 14:57:58 -04:00
Brad King 4c68a0e71a Merge topic 'envmod-test-modifying-existing' 
9c4d6404eb Tests/Environment: also test modifying ambient values
7d52d48a32 cmCTestRunTest: get the default value from the environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6682
 2021-11-01 09:08:11 -04:00
Brad King 562ee8a50b Merge topic 'misc-messages' 
dbe33b20bd install: Add context to {PUBLIC,PRIVATE}_HEADER/RESOURCE DESTINATION warnings
1a25f057da cmComputeLinkInformation: Add context to warning about linking a directory
4862f3b2c8 cmcmd: Write progress and tar errors directly to stderr
efc6c23a47 bootstrap: Do not declare cmSystemTools functions that are not implemented

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6680
 2021-11-01 09:07:13 -04:00
Brad King 37c2f722fc find_program: Explicitly skip WindowsApps/python*.exe app installer links 
Windows provide a "python" executable like this:

    %USERPROFILE%\AppData\Local\Microsoft\WindowsApps\python.exe

It is actually a Windows app exec link.  If it points to an app
installer, avoid mistaking it for a working Python.
 2021-11-01 09:03:51 -04:00
Brad King d8b5b0c7e4 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-11-01 (572f2a65)
 2021-11-01 09:03:45 -04:00
Kitware Robot f13b8a52ee CMake Nightly Date Stamp 2021-11-01 00:01:12 -04:00
Kitware Robot 56717f4c3c CMake Nightly Date Stamp 2021-10-31 00:02:09 -04:00
Kitware Robot 22f3892f9a CMake Nightly Date Stamp 2021-10-30 00:02:17 -04:00
Brad King 195d47e213 VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instance 
Previously the `CMAKE_GENERATOR_INSTANCE` value was used only to filter
the instances reported by the Visual Studio Installer tool.  If the
specified install location is not known to the VS Installer, but the
user provided a `version=` field, check for the installation directly
on disk.

Fixes: #21639, #22197
 2021-10-29 11:52:58 -04:00
Brad King ec8d37b3b1 VS: Support version specification in CMAKE_GENERATOR_INSTANCE 2021-10-29 11:52:58 -04:00
Brad King 8e6d930e8c VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCE 2021-10-29 11:52:58 -04:00
Brad King 5d1f377737 cmVSSetupHelper: Factor out helper to load MSVC toolset version 2021-10-29 11:52:58 -04:00
Brad King 006fe1e919 cmVSSetupHelper: Convert wide to narrow strings early 2021-10-29 11:52:58 -04:00
Brad King f5dfc788b8 cmVSSetupHelper: Drop unused InstanceId field 
Minimize the amount of information needed about a VS instance.
 2021-10-29 11:52:57 -04:00
Brad King 3213e2595d cmVSSetupHelper: Drop unused ullVersion field 
The field has not been used since commit 3fd65f5ca6 (VS: Compare VS
instance versions as strings, 2021-06-17, v3.21.0-rc1~11^2~1).
 2021-10-29 11:52:57 -04:00
Ben Boeckel 7d52d48a32 cmCTestRunTest: get the default value from the environment 
This only works due to some assumptions about how the `ENVIRONMENT`
property is processed. Comments have been added to notify anyone
modifying the behavior about where to look.

Fixes: #22819
 2021-10-29 10:54:02 -04:00
Brad King 7a31aeffe8 Merge topic 'ifw-archive-format' 
62ef2729ee CPackIFW: add support for archive format and compression level options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6666
 2021-10-29 08:54:23 -04:00
Brad King 0486f9e56e Merge topic 'swift-win32-property' 
c782f140d4 Swift: Ignore WIN32_EXECUTABLE property outside of Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6658
 2021-10-29 08:53:26 -04:00
Kitware Robot 83aeec6015 CMake Nightly Date Stamp 2021-10-29 00:02:01 -04:00
hotwatermorning c782f140d4 Swift: Ignore WIN32_EXECUTABLE property outside of Windows 
Issue: #19877
 2021-10-28 15:32:44 -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
Erlend E. Aasland 62ef2729ee CPackIFW: add support for archive format and compression level options 
Adds the following CPackIFW variables:

- CPACK_IFW_ARCHIVE_FORMAT
- CPACK_IFW_ARCHIVE_COMPRESSION

These variables control mirror the --archive-format and --compression
options of the QtIFW binarycreator and repogen tools.

Fixes: #22803

Co-authored-by: Erlend E. Aasland <erlend.aasland@innova.no>
Co-authored-by: Awen Autret
 2021-10-28 15:46:22 +02:00
Brad King 28a033cc7d CMake 3.22.0-rc2 2021-10-28 09:46:08 -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 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 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
Kyle Edwards 447fbf061a EscapeForCMake: Add wrapQuotes parameter 2021-10-27 13:27:02 -04:00
Brad King dbe33b20bd install: Add context to {PUBLIC,PRIVATE}_HEADER/RESOURCE DESTINATION warnings 2021-10-27 12:59:16 -04:00
Brad King 1a25f057da cmComputeLinkInformation: Add context to warning about linking a directory 2021-10-27 12:58:46 -04:00
Brad King 4862f3b2c8 cmcmd: Write progress and tar errors directly to stderr 
In these code paths, `cmSystemTools::Message` never has a callback
set.  Inline the non-callback implementation at call sites.
 2021-10-27 12:58:29 -04:00
Brad King efc6c23a47 bootstrap: Do not declare cmSystemTools functions that are not implemented 
Convert runtime error messages into compile-time errors.
 2021-10-27 12:58: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
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 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