mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-19 22:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
64,586 Commits 2 Branches 401 Tags
6bd77281ea2c14b116461feeab356e40e69de280
Commit Graph

64586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 6bd77281ea Merge branch 'release-3.28' 2024-01-17 09:34:59 -05:00
Brad King 10131f2c53 Merge topic 'matlab-win' 
42fbe01eba FindMatlab: Accept long version in matlab_get_release_name_from_version
c608adc236 FindMatlab: Fix major.minor version lookups in Windows Registry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9148
 2024-01-17 09:34:59 -05:00
Brad King 3c868a3fb4 Merge topic 'matlab-win' into release-3.28 
42fbe01eba FindMatlab: Accept long version in matlab_get_release_name_from_version
c608adc236 FindMatlab: Fix major.minor version lookups in Windows Registry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9148
 2024-01-17 09:34:58 -05:00
Kitware Robot 69b562c8ad CMake Nightly Date Stamp 2024-01-17 00:01:09 -05:00
Brad King 7010eb5fea Merge topic 'doc-CMP0156' 
64b682d3ba Help: Fix typo in CMP0156 documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !9159
 2024-01-16 13:22:57 -05:00
Brad King 64b682d3ba Help: Fix typo in CMP0156 documentation 2024-01-16 11:49:00 -05:00
Brad King eee631bb8a Merge topic 'ewilde/swift-escapism' 
9950a69f26 Swift/Ninja: Fix compile commands output file path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9150
 2024-01-16 11:44:58 -05:00
scivision 42fbe01eba FindMatlab: Accept long version in matlab_get_release_name_from_version 
Make this work:

  matlab_get_release_name_from_version(${Matlab_VERSION})

which the user would expect.

While at it, simplify this function code.
 2024-01-16 11:37:43 -05:00
scivision c608adc236 FindMatlab: Fix major.minor version lookups in Windows Registry 
The registry key names use only the first two version components.
Previously we were using the full versions.

Fixes: #25582
 2024-01-16 11:35:32 -05:00
Brad King 267c480b24 Merge branch 'release-3.28' 2024-01-16 11:10:30 -05:00
Brad King 320d6f446d Merge topic 'FindMatlab-fix-version-without-versioninfoxml' 
694727bb45 FindMatlab: Restore support for versions without VersionInfo.xml

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9151
 2024-01-16 11:10:29 -05:00
Brad King cce2120428 Merge topic 'FindMatlab-fix-version-without-versioninfoxml' into release-3.28 
694727bb45 FindMatlab: Restore support for versions without VersionInfo.xml

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9151
 2024-01-16 11:10:28 -05:00
Brad King fc2590e9e7 Merge topic 'doc-policies' 
83b9029208 Help: Clarify standard policy advice paragraph wording on how policies are set
faa2bf22df Help: Drop current CMake version from standard policy advice paragraph
ad3c2c0b03 Help: Normalize and consolidate standard policy advice paragraph

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mi-La <milan.kriz@eccam.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9149
 2024-01-16 11:06:52 -05:00
Kitware Robot a68d899874 CMake Nightly Date Stamp 2024-01-16 00:01:06 -05:00
Kitware Robot 76db09fd75 CMake Nightly Date Stamp 2024-01-15 00:01:56 -05:00
Kitware Robot 8f85931b8a CMake Nightly Date Stamp 2024-01-14 00:01:10 -05:00
Kitware Robot 1d97e51c75 CMake Nightly Date Stamp 2024-01-13 00:01:07 -05:00
Hermann von Kleist 694727bb45 FindMatlab: Restore support for versions without VersionInfo.xml 
Report "unknown" in `_Matlab_VersionInfoXML` if file is missing.
Fix omitted MATLAB root with unknown version from XML.

Fixes: #25585
Fixes: #25586
 2024-01-12 09:38:12 -05:00
Brad King e315d7cb19 Merge topic 'swift-sources-in-resp-file' 
b767917ebb Swift/Ninja: Include sources in response file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9143
 2024-01-12 08:53:10 -05:00
Kitware Robot 8728fb1efc CMake Nightly Date Stamp 2024-01-12 00:01:11 -05:00
Evan Wilde 9950a69f26 Swift/Ninja: Fix compile commands output file path 
The exported compile commands did not use the proper file path separator
for Windows in the output field for Swift files. This patch adds the
appropriate filepath fix-ups to the output-field.

Fixes: #25580
 2024-01-11 20:31:40 -08:00
Brad King 83b9029208 Help: Clarify standard policy advice paragraph wording on how policies are set 
Avoid implying that a policy must always be set explicitly.
 2024-01-11 15:01:59 -05:00
Brad King faa2bf22df Help: Drop current CMake version from standard policy advice paragraph 
Every policy documents whether CMake warns when it is not set.
This behavior does not change with the CMake version, so avoid
possibly confusing mention of the current CMake version.
 2024-01-11 14:56:07 -05:00
Brad King ad3c2c0b03 Help: Normalize and consolidate standard policy advice paragraph 
Every policy's documentation has a paragraph on what version of CMake
introduced it, how to set the policy, and whether CMake warns if the
policy is not set.  The wording of this paragraph has diverged across
policies over time.  Factor the paragraph out into a standard advice
document included by every policy.
 2024-01-11 14:48:01 -05:00
Brad King c6d69d84db Merge topic 'file-strings-regex-match' 
fa00928bcd file: `STRINGS` + `REGEX` store match results
ff0085cf74 Help: Drop incorrect versionadded mark from CMAKE_MATCH_<n>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9124
 2024-01-11 10:07:48 -05:00
Brad King 97713da650 Merge topic 'swift-implib' 
a2aad7eb8d Swift: fix Windows DLL import library support for CMP0157 NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Jeremy Day <jadaytime@gmail.com>
Merge-request: !9140
 2024-01-11 10:06:39 -05:00
Brad King 1c02642ee6 Merge topic 'package-dispatch-apple' 
2a398cd9b6 CMakePackageConfigHelpers: Clarify generate_apple_*_selection_file signatures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9130
 2024-01-11 10:05:49 -05:00
Brad King d3d6c41d7f Merge topic 'ci-linkcheck' 
5b302bf5fe FindCxxTest: Drop broken anchor on link to cxxtest project page

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9146
 2024-01-11 10:01:41 -05:00
Brad King 4bc3317c64 Merge branch 'release-3.28' 2024-01-11 09:59:53 -05:00
Brad King 930f2f51d9 Merge topic 'update-zlib' 
941b948a85 Merge branch 'upstream-zlib' into update-zlib
5d030dc716 zlib 2022-10-12 (04f42cec)
b7379f9e21 zlib: Update script to get zlib 1.2.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9145
 2024-01-11 09:59:53 -05:00
Brad King 01e3eb91b8 Merge topic 'update-zlib' into release-3.28 
941b948a85 Merge branch 'upstream-zlib' into update-zlib
5d030dc716 zlib 2022-10-12 (04f42cec)
b7379f9e21 zlib: Update script to get zlib 1.2.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9145
 2024-01-11 09:59:52 -05:00
Kitware Robot d8d895260f CMake Nightly Date Stamp 2024-01-11 00:01:11 -05:00
Evan Wilde b767917ebb Swift/Ninja: Include sources in response file 
Unlike C/C++, Swift compiles all sources in a module at once. This can
quickly overwhelm the commandline length limit on Windows, so it is
useful to place the source files in the response file.

Issue: #25572
 2024-01-10 16:08:16 -08:00
Brad King 5b302bf5fe FindCxxTest: Drop broken anchor on link to cxxtest project page 2024-01-10 13:48:09 -05:00
Saleem Abdulrasool a2aad7eb8d Swift: fix Windows DLL import library support for CMP0157 NEW 
This was accidentally removed when the command templates were
reorganized to introduce the new policy. Restore the flag in the shared
library creation to ensure that we emit the import libraries to the
correct location.
 2024-01-10 08:02:36 -08:00
Brad King 941b948a85 Merge branch 'upstream-zlib' into update-zlib 
* upstream-zlib:
  zlib 2022-10-12 (04f42cec)

Fixes: #25576
 2024-01-10 10:29:17 -05:00
zlib upstream 5d030dc716 zlib 2022-10-12 (04f42cec) 
Code extracted from:

    https://github.com/madler/zlib.git

at commit 04f42ceca40f73e2978b50e93806c2a18c1281fc (v1.2.13).
 2024-01-10 10:29:05 -05:00
Brad King b7379f9e21 zlib: Update script to get zlib 1.2.13 
Issue: #25576
 2024-01-10 10:28:46 -05:00
Brad King 1e8b283554 Merge topic 'static' 
9e829779f2 Swift: preserve `-static` for static library swiftmodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9141
 2024-01-10 10:20:37 -05:00
Brad King 4a9599927f Merge topic 'orkun_refactor_09_01_2024' 
63d4e4ec28 Makefile: Reduce string copies
4d928592eb Makefile: Remove redundant push_back
3e533bd64f Makefile: Improve const correctness
c2dd5dfbe8 Makefile: Remove no-op call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9142
 2024-01-10 10:19:12 -05:00
Brad King 8dc079581e Merge branch 'release-3.28' 2024-01-10 10:17:03 -05:00
Brad King 899a1f64af Merge topic 'vs-scan-for-modules' 
405dc7d19c Tests/CXXModules/scan_properties: use `ixx` extension
029ddc3410 cmVisualStudio10TargetGenerator: always specify scanning
6c9614cbf4 Tests/CXXModules: add a test case for VS generation without flags
34f4423851 cmVisualStudio10TargetGenerator: fix typo in flag name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9104
 2024-01-10 10:17:03 -05:00
Brad King 3160b136b2 Merge topic 'vs-scan-for-modules' into release-3.28 
405dc7d19c Tests/CXXModules/scan_properties: use `ixx` extension
029ddc3410 cmVisualStudio10TargetGenerator: always specify scanning
6c9614cbf4 Tests/CXXModules: add a test case for VS generation without flags
34f4423851 cmVisualStudio10TargetGenerator: fix typo in flag name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9104
 2024-01-10 10:17:01 -05:00
Brad King 5ef0e9f0ae Merge branch 'release-3.28' 2024-01-10 10:15:46 -05:00
Brad King 446abdf324 Merge topic 'cxxmodules-no-unity' 
63bbb3768d cmLocalGenerator: ignore scanned sources for unity builds
76b5383123 cmGlobalGenerator: add unity sources after computing target compile features
7fc2a83fe6 Tests/CXXModules: add a test with unity build support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9118
 2024-01-10 10:15:46 -05:00
Brad King 2858af8d6b Merge topic 'cxxmodules-no-unity' into release-3.28 
63bbb3768d cmLocalGenerator: ignore scanned sources for unity builds
76b5383123 cmGlobalGenerator: add unity sources after computing target compile features
7fc2a83fe6 Tests/CXXModules: add a test with unity build support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9118
 2024-01-10 10:15:44 -05:00
Brad King 8c4f0bf6a3 Merge branch 'release-3.28' 2024-01-10 10:14:24 -05:00
Brad King 711e3f955a Merge topic 'makefile-depfile' 
7198f0d149 Makefile: Fix double escaping when DEPFILE is used
5162ff64d4 Makefile: Reduce string copies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9138
 2024-01-10 10:14:24 -05:00
Brad King 3d14d84443 Merge topic 'makefile-depfile' into release-3.28 
7198f0d149 Makefile: Fix double escaping when DEPFILE is used
5162ff64d4 Makefile: Reduce string copies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9138
 2024-01-10 10:14:23 -05:00
Kitware Robot 87200ec97f CMake Nightly Date Stamp 2024-01-10 00:01:08 -05:00