Commit Graph

69081 Commits

Author SHA1 Message Date
Brad King
0938643895 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2025-02-10 (2e2f80f1)
2025-02-10 08:27:08 -05:00
KWSys Upstream
c4206da3f7 KWSys 2025-02-10 (2e2f80f1)
Code extracted from:

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

at commit 2e2f80f1d074b1f888ff41f5bc5a2229f3eab6a0 (master).

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

Brad Smith (1):
      a13d90c2 SystemInformation: use HW_NCPUONLINE on OpenBSD and NetBSD
2025-02-10 08:27:08 -05:00
Brad King
640cf691fe Merge topic 'instrumentation-build-config' into release-4.0
9689155a05 instrumentation: Add Config value to snippet data
ee3a55fc48 cmMakefileGenerator: Update GetConfigName to return const reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10300
2025-02-10 08:24:59 -05:00
Brad King
599ad2b12d Merge topic 'sunos-i386-mkdtemp' into release-4.0
4db9e1009d Solaris: Backport our mkdtemp code paths to SunOS 5.10 i386
f189e64126 Tests: Add cases covering our mkdtemp code paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10313
2025-02-10 08:21:01 -05:00
Brad King
d51863e265 Merge topic 'curl-default-cainfo' into release-4.0
ef848cdfc7 cmake: Add default CA path /etc/opt/csw/ssl/certs on Solaris

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10312
2025-02-10 08:19:46 -05:00
Brad King
0d951879f4 Merge topic 'libarchive-openssl' into release-4.0
2bfb9f7e8a libarchive: Restore explicit linking to openssl crypto library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10311
2025-02-10 08:16:37 -05:00
Brad King
ef848cdfc7 cmake: Add default CA path /etc/opt/csw/ssl/certs on Solaris
Extend commit 0abd3e538e (cmake: Use a default CA path when not using
system curl, 2015-01-22, v3.2.0-rc1~66^2) to cover Solaris with OpenCSW.
2025-02-09 13:31:07 -05:00
Brad King
4db9e1009d Solaris: Backport our mkdtemp code paths to SunOS 5.10 i386
`mkdtemp` is not available on this architecture until SunOS 5.11.
Look up the symbol at runtime, and if missing, fall back to an
approximate implementation.
2025-02-09 13:29:39 -05:00
Brad King
f189e64126 Tests: Add cases covering our mkdtemp code paths
* `cmSystemTools::MakeTempDirectory` is our own code.

* `uv_fs_mkdtemp` requires patching to backport to platforms
  not supported by upstream libuv.
2025-02-09 13:29:38 -05:00
Brad King
2bfb9f7e8a libarchive: Restore explicit linking to openssl crypto library
This is present in the upstream libarchive CMake code.  We removed it
in commit 59d28b2849 (libarchive: Drop early use of crypto library,
2016-05-03, v3.6.0-rc1~100^2), but didn't record details for why.
Many other changes have been made since then, so the original problem
may no longer occur.  Restore the link dependency since it reflects
a real dependency of the implementation.
2025-02-09 13:23:56 -05:00
Brad King
ec24f910d8 Merge topic 'test-system-tools' into release-4.0
b1e37ad8bb Tests: Port CMakeLib.testSystemTools to common infrastructure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10309
2025-02-09 12:34:20 -05:00
Brad King
bfba4cc507 Merge topic 'ci-linkcheck' into release-4.0
6f7341ed27 CPack/WIX: Replace documentation links with their permanent redirects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10308
2025-02-09 12:32:04 -05:00
Martin Duffy
9689155a05 instrumentation: Add Config value to snippet data 2025-02-09 12:29:09 -05:00
Martin Duffy
ee3a55fc48 cmMakefileGenerator: Update GetConfigName to return const reference 2025-02-09 12:29:08 -05:00
Brad King
b1e37ad8bb Tests: Port CMakeLib.testSystemTools to common infrastructure 2025-02-08 09:51:18 -05:00
Brad King
6f7341ed27 CPack/WIX: Replace documentation links with their permanent redirects 2025-02-08 09:39:02 -05:00
Brad King
feaa0f5cc0 Merge topic 'aix-id-var' into release-4.0
ff03db6657 AIX: Add platform id variables 'AIX' and 'CMAKE_HOST_AIX'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10304
2025-02-08 09:29:45 -05:00
Brad King
9b57b874d6 Merge topic 'ci-typos' into release-4.0
ddebf4653d ci: Do not check commit messages with 'typos' due to false positives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10306
2025-02-08 09:26:57 -05:00
Brad King
357c8fd7be Merge topic 'xcode-compiler-id-no-xctest' into release-4.0
e7062a79bd Xcode: Remove compiler id dependency on xctest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !10303
2025-02-08 09:25:50 -05:00
Brad King
b1c7374ee1 Merge branch 'release-3.31' into release-4.0 2025-02-08 09:23:48 -05:00
Brad King
e9b044730e Merge topic 'ticlang-uppercase-arm-architecture' into release-4.0
3fa159dd57 TIClang: Make ARM architecture id uppercase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10302
2025-02-08 09:22:55 -05:00
Evan Wilde
e7062a79bd Xcode: Remove compiler id dependency on xctest
Previously the compiler identification project would implicitly generate
unit-tests that depend on XCTest when building for iOS, visionOS, and tvOS.

Fixes: #26600
2025-02-07 11:30:05 -05:00
Aditya Vidyadhar Kamath
ff03db6657 AIX: Add platform id variables 'AIX' and 'CMAKE_HOST_AIX'
This allows projects to use `if(AIX)` blocks instead of spelling
out `if(CMAKE_SYSTEM_NAME STREQUAL "AIX")`.  We already have similar
variables for many other platforms.
2025-02-07 11:10:43 -05:00
Brad King
ddebf4653d ci: Do not check commit messages with 'typos' due to false positives
Since commit c3777c1536 (ci: Extend spellcheck job with 'typos' tool,
2025-01-04) we check spelling with `typos` in addition to the
pre-existing check with `codespell`.  Unlike `codespell`, `typos` can
find typos in combined identifiers, e.g., `PascalCase` or `snake_case`.
That works well for code, but in commit messages it can trigger on
"words" in the middle of commit hashes.
2025-02-07 10:04:18 -05:00
Brad King
3d8b8dbe56 Merge branch 'release-3.30' into release-3.31 2025-02-07 09:46:38 -05:00
Brad King
67e551c414 Merge branch 'release-3.29' into release-3.30 2025-02-07 09:46:32 -05:00
Brad King
13cf00ad71 Merge topic 'ticlang-uppercase-arm-architecture' into release-3.31
3fa159dd57 TIClang: Make ARM architecture id uppercase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10302
2025-02-07 09:46:14 -05:00
Brad King
d5ab13e5d1 Merge topic 'ticlang-uppercase-arm-architecture' into release-3.30
3fa159dd57 TIClang: Make ARM architecture id uppercase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10302
2025-02-07 09:45:59 -05:00
Brad King
340bdd1da9 Merge topic 'ticlang-uppercase-arm-architecture' into release-3.29
3fa159dd57 TIClang: Make ARM architecture id uppercase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10302
2025-02-07 09:45:11 -05:00
Josef Angstenberger
3fa159dd57 TIClang: Make ARM architecture id uppercase
The initial compiler support implemented in commit 9ba0a54554 (TIClang:
Add support for TI Clang-based compilers, including tiarmclang,
2023-12-06) introduced `Arm` as architecture instead of `ARM` which is
used for all other compilers.
2025-02-07 09:29:32 -05:00
Brad King
8137cf2822 Merge topic 'split-run-cmake-find_package-tests' into release-4.0
5ae2596027 Tests: Simplify and improve RunCMake/find_package-CPS tests
619c1bacfd Tests: Separate out CPS RunCMake/find_package tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !10301
2025-02-07 08:36:23 -05:00
Brad King
e74ff65385 Merge topic 'instrumentation-make-hooks' into release-4.0
314440c320 instrumentation: Run preBuild and postBuild hooks before and after make
6598248da7 instrumentation: Avoid busy-wait on postBuild hook
f8339cb944 instrumentation: Enable tests on more Makefile generators
0fbb927bdd instrumentation: Disable preBuild and postBuild hooks on Windows
a13be1301f Tests/RunCMake/Instrumentation: Improve quoting and escaping in CMake code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10295
2025-02-07 08:32:04 -05:00
Brad King
4c50496a11 Merge topic 'tasking-output-ext-small-enh' into release-4.0
83ce71dd38 Tasking: Enable WHOLE_ARCHIVE link feature
5729d6a66d Tasking: Detect ARM architecture for C++
1241c7dbcf Tasking: Set response file flag
754210a3f6 Tasking: Set object extension to .o

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10298
2025-02-07 08:25:51 -05:00
Brad King
b4524c7acc Merge topic 'update-curl' into release-4.0
0e1f3f175c curl: Set build options the way we need for CMake
ae94c2369d curl: Clarify comments marking our local changes to the CMake code
7f2b2375ba Merge branch 'upstream-curl' into update-curl
48b13baebc curl 2025-02-05 (34cf9d54)
e8c41f4780 curl: Update script to get curl 8.12.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10291
2025-02-07 08:21:44 -05:00
Brad King
fc18e51970 Merge topic 'update-kwsys' into release-4.0
a78db45626 Merge branch 'upstream-KWSys' into update-kwsys
1a8650a908 KWSys 2025-02-07 (60bb82bc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10299
2025-02-07 08:19:53 -05:00
Brad King
a78db45626 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2025-02-07 (60bb82bc)
2025-02-07 07:16:44 -05:00
KWSys Upstream
1a8650a908 KWSys 2025-02-07 (60bb82bc)
Code extracted from:

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

at commit 60bb82bcf3b0db6c7ad9a49885dbd6a072f31d11 (master).

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

Nikita Nemkin (2):
      2ab910a3 SystemTools: Improve repeated slash handling in ConvertToUnixSlashes
      22af8b25 SystemTools: Fix invalid memory access in ConvertToUnixSlashes
2025-02-07 07:16:43 -05:00
Matthew Woehlke
5ae2596027 Tests: Simplify and improve RunCMake/find_package-CPS tests
Refactor common logic out of individual RunCMake/find_package-CPS tests.
Move enabling the experimental gate to the RunCMakeTest.cmake, add a
separate test to verify the experimental warning, and suppress it
everywhere else. This will greatly simplify writing non-failure tests.
2025-02-06 15:23:09 -05:00
Matthew Woehlke
619c1bacfd Tests: Separate out CPS RunCMake/find_package tests
The set of RunCMake/find_package tests is quite large, which makes
development and management less efficient. While this could probably
stand additional refactoring, split out just the CPS tests for now, as
those are currently under active development.
2025-02-06 15:23:09 -05:00
Josef Angstenberger
83ce71dd38 Tasking: Enable WHOLE_ARCHIVE link feature
Issue: #26426
2025-02-06 10:55:31 -05:00
Josef Angstenberger
5729d6a66d Tasking: Detect ARM architecture for C++
The preprocessor switch to detect architectures on Tasking
differ for C and C++.

Issue: #26426
2025-02-06 10:55:31 -05:00
Josef Angstenberger
1241c7dbcf Tasking: Set response file flag
If not explicitly set to `-f `, the default `@` is used,
which is not supported by Tasking.

Issue: #26426
2025-02-06 10:55:31 -05:00
Josef Angstenberger
754210a3f6 Tasking: Set object extension to .o
The extension `.o` is used by the compiler itself,
and is the only one found in its documentation.

Issue: #26426
2025-02-06 10:55:31 -05:00
Brad King
ae68964f5d Merge topic 'multiline-cache-help' into release-4.0
637a0f7ed4 cmCacheManager: Prevent corruption from multiline help strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10290
2025-02-06 10:39:11 -05:00
Brad King
95fc2b982a Merge topic 'FindArmadillo-msvc-link-transitive' into release-4.0
6745af99c8 FindArmadillo: Fix wrapper linking with MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10292
2025-02-06 10:37:48 -05:00
Martin Duffy
314440c320 instrumentation: Run preBuild and postBuild hooks before and after make
Updates the preBuild and postBuild instrumentation hooks to run before and
after make is invoked.
2025-02-06 09:49:09 -05:00
Martin Duffy
6598248da7 instrumentation: Avoid busy-wait on postBuild hook 2025-02-06 07:46:09 -05:00
Martin Duffy
f8339cb944 instrumentation: Enable tests on more Makefile generators 2025-02-06 07:46:09 -05:00
Martin Duffy
0fbb927bdd instrumentation: Disable preBuild and postBuild hooks on Windows
The implementation does not work on Windows.

Issue: #26668
2025-02-06 07:46:09 -05:00
Brad King
a13be1301f Tests/RunCMake/Instrumentation: Improve quoting and escaping in CMake code 2025-02-06 07:45:02 -05:00