mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 14:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
55,133 Commits 2 Branches 401 Tags
37c2f722fcae58f2834a061f52f2ddb78dac2fb2
Commit Graph

55133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
KWSys Upstream e9ab6eeeb5 KWSys 2021-11-01 (572f2a65) 
Code extracted from:

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

at commit 572f2a6592d671ecc865fe7821a0f4803deb9be7 (master).

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

Brad King (3):
      025a4951 SystemTools: Add Windows app exec alias support to ReadSymlink
      f5b3500f SystemTools: Simplify FileIsExecutable on Windows
      bcddb31b SystemTools: Fix Windows app exec alias layout

Yuriy O'Donnell (1):
      29f31d17 SystemTools: Add Windows app exec alias support to FileExists()
 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 41907da8ea Merge branch 'release-3.22' 2021-10-29 11:52:09 -04:00
Brad King 2c5862baa2 Merge topic 'doc-vs-instance-ver' 
0ad79f7ba8 Help: Fix versionadded for VS 15 2017 instance selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6681
 2021-10-29 11:52:09 -04:00
Brad King 6b64cc12af Merge topic 'doc-vs-instance-ver' into release-3.22 
0ad79f7ba8 Help: Fix versionadded for VS 15 2017 instance selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6681
 2021-10-29 11:52:08 -04:00
Brad King 0ad79f7ba8 Help: Fix versionadded for VS 15 2017 instance selection 
Support for `CMAKE_GENERATOR_INSTANCE` was added in CMake 3.11, but the
possibility was mentioned in a comment in older versions, so the wrong
versionadded value was used in commit c43e845d09 (Help: Add `..
versionadded` directives to generator docs, 2020-11-11,
v3.20.0-rc1~476^2).
 2021-10-29 09:47:01 -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
Brad King 71833ee6b5 Merge branch 'release-3.22' 2021-10-29 08:52:19 -04:00
Brad King 4572c40df5 Merge topic 'msvc-c17' into release-3.22 
c5cc4ddac4 MSVC: Add support for C17
6561b032bc MSVC: Tolerate c_std_17 and c_std_23 features on older compiler versions
22f804e0ec MSVC: Refactor C compile features table for C90, C99, and C11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6677
 2021-10-29 08:52:18 -04:00
Brad King 3026d8468b Merge topic 'msvc-c17' 
c5cc4ddac4 MSVC: Add support for C17
6561b032bc MSVC: Tolerate c_std_17 and c_std_23 features on older compiler versions
22f804e0ec MSVC: Refactor C compile features table for C90, C99, and C11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6677
 2021-10-29 08:52:18 -04:00
Brad King 09a43a0889 Merge branch 'release-3.22' 2021-10-29 08:51:24 -04:00
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
Brad King f594e32841 Merge topic 'doc-configure_file-creates-directories' into release-3.22 
fa47e9c8f9 Help: Document that configure_file can create directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6675
 2021-10-29 08:51:23 -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
Marc Aldorasi fa47e9c8f9 Help: Document that configure_file can create directories 2021-10-28 12:48:25 -04:00
Brad King c5cc4ddac4 MSVC: Add support for C17 
C17 support has been available in MSVC since VS 16.8.

Fixes: #22816
 2021-10-28 12:27:00 -04:00
Brad King 6561b032bc MSVC: Tolerate c_std_17 and c_std_23 features on older compiler versions 
MSVC `cl` versions prior to 19.27 had no `-std:c*` flags for C
standards.  List the `c_std_{17,23}` features anyway.  This allows
projects to at least attempt compilation with these compilers since they
do not have any modes.
 2021-10-28 12:27:00 -04:00
Brad King 22f804e0ec MSVC: Refactor C compile features table for C90, C99, and C11 
The custom "no modes" `cmake_record_c_compile_features` implementation
should only be used in `cl` versions prior to 19.27 because they had no
`-std:c*` flags for C standards.  For 19.27 we need a different custom
implementation to account for partial C11 support.  For 19.28 and above
we can use the default implementation through the `*__HAS_FULL_SUPPORT`
settings.

We already use this pattern in the MSVC C++ compile feature table.
 2021-10-28 12:27:00 -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
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 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