mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
66,940 Commits 2 Branches 401 Tags
ea184f510c69a141af40e33f54b391cd22a6044e
Commit Graph

66940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott ea184f510c Merge topic 'doc-fc-project-var-name-clashes' 
13bf4dc9ef Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9747
 2024-08-19 06:16:34 -04:00
Kitware Robot 43fd48a210 CMake Nightly Date Stamp 2024-08-19 00:02:34 -04:00
Kitware Robot 34146501ff CMake Nightly Date Stamp 2024-08-18 00:01:25 -04:00
Craig Scott dfa4ff89ef Merge topic 'deprecate-CMakeFindFrameworks' 
dd87640a22 CMakeFindFrameworks: Deprecate the module subject to policy CMP0173

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9742
 2024-08-17 18:35:58 -04:00
Craig Scott 13bf4dc9ef Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR 
Fixes: #25714
 2024-08-17 16:11:22 +10:00
Kitware Robot d5b23f5575 CMake Nightly Date Stamp 2024-08-17 00:01:28 -04:00
Kitware Robot 1debc1f2bc CMake Nightly Date Stamp 2024-08-16 00:01:12 -04:00
Craig Scott dd87640a22 CMakeFindFrameworks: Deprecate the module subject to policy CMP0173 
Fixes: #20446
 2024-08-16 11:10:27 +10:00
Brad King 2904ce00d2 Merge branch 'release-3.30' 2024-08-15 10:34:27 -04:00
Brad King a7bc881847 Merge topic 'FindJNI-zero-vm-location' 
983291669d FindJNI: Support finding libjvm.so for all OpenJDK variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9725
 2024-08-15 10:34:26 -04:00
Brad King 97bb92ace5 Merge topic 'FindJNI-zero-vm-location' into release-3.30 
983291669d FindJNI: Support finding libjvm.so for all OpenJDK variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9725
 2024-08-15 10:34:25 -04:00
Brad King 9b163c6a21 Merge branch 'release-3.30' 2024-08-15 10:08:24 -04:00
Brad King 076784f4f3 Merge branch 'release-3.29' 2024-08-15 10:08:19 -04:00
Brad King 5f42d87aca Merge branch 'release-3.29' into release-3.30 2024-08-15 10:08:10 -04:00
Brad King 0cbb3a4e9c Merge topic 'cppdap-gcc-15' into release-3.30 
f742c298a0 cppdap: include/dap/network.h: add <stdint.h> include for GCC 15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9713
 2024-08-15 10:07:51 -04:00
Brad King 464719b35b Merge topic 'cppdap-gcc-15' into release-3.29 
f742c298a0 cppdap: include/dap/network.h: add <stdint.h> include for GCC 15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9713
 2024-08-15 10:02:17 -04:00
Brad King 1d46a7f7ee Merge topic 'update-cppdap' 
f6745ed29f Merge branch 'upstream-cppdap' into update-cppdap
bcfd096ed9 cppdap 2024-08-02 (c69444ed)
5098a08fde cppdap: Update script to get version as of 2024-08-02

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9730
 2024-08-15 09:50:58 -04:00
Brad King 7d74c35dd5 Merge topic 'update-expat' 
6b8ab3c282 expat: Hard-code configuration options for our needs
25c2d60c04 Merge branch 'upstream-expat' into update-expat
865006f033 expat 2024-03-13 (fa75b965)
fc5bbb1f01 expat: Update script to get Expat 2.6.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9729
 2024-08-15 09:49:59 -04:00
Brad King e0f12564dc Merge topic 'iar-missing-license' 
564d527c04 IAR: Improve error message for missing license

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9723
 2024-08-15 09:48:27 -04:00
Brad King 683910854c Merge topic 'UseJava-verbosity' 
ea62c44b64 UseJava: Reduce add_jar verbosity by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9710
 2024-08-15 09:47:14 -04:00
Brad King 15a94f1d28 Merge topic 'pkg-config' 
25b947589a Modules: Guard calls to pkg_check_modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9709
 2024-08-15 09:46:01 -04:00
WANG Xuerui 983291669d FindJNI: Support finding libjvm.so for all OpenJDK variants 
Formerly only the "client" and "server" variant directories are being
checked for libjvm.so, but according to a 2021 OpenJDK upstream change
present in OpenJDK >= 18, there can be "minimal" and "zero" variants as
well. In particular, formerly (OpenJDK <= 17) the Zero variant had its
libjvm.so in "server/", but "zero/" in newer versions, which regressed
downstream CMake project builds running on systems with OpenJDK Zero VM.

Fix it by checking all 4 variant directories for libjvm.so.

Link: https://bugs.openjdk.org/browse/JDK-8273494
Link: https://github.com/openjdk/jdk/pull/5440
Link: https://github.com/openjdk/jdk/commit/8fbcc8239a3fc04e56ebbd287c7bb5db731977b7
Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1078446
 2024-08-15 09:41:57 -04:00
Brad King 433cb155b5 Merge branch 'release-3.30' 2024-08-15 09:37:00 -04:00
Brad King d060b05217 Merge topic 'macos-curl-user-agent' 
1a74f95656 file(DOWNLOAD): Fix User-Agent to use run-time curl version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9726
 2024-08-15 09:37:00 -04:00
Brad King 3265458a79 Merge topic 'macos-curl-user-agent' into release-3.30 
1a74f95656 file(DOWNLOAD): Fix User-Agent to use run-time curl version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9726
 2024-08-15 09:36:58 -04:00
Brad King 67e14b19bc Merge branch 'release-3.30' 2024-08-15 09:35:37 -04:00
Brad King 0460e71e1f Merge topic 'curl-http2' 
7486f468fb curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error codes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9728
 2024-08-15 09:35:37 -04:00
Brad King 16b6847861 Merge topic 'curl-http2' into release-3.30 
7486f468fb curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error codes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9728
 2024-08-15 09:35:35 -04:00
Craig Scott 41da7a4a9a Merge topic 'fix_condition_android_determine' 
4b84596dcf Android: Fix condition detecting no APIs found in the NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9721
 2024-08-15 07:18:37 -04:00
Kitware Robot 3e072b018a CMake Nightly Date Stamp 2024-08-15 00:01:17 -04:00
Brad King 48c0b01197 Merge topic 'doc-log' 
d03bb13839 Help: version 3.16 added cmake --log-level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9711
 2024-08-14 13:33:00 -04:00
Brad King db304b343b Merge topic 'patch-oracle-developer-studio' 
4086e81e38 Help: Rename Oracle Solaris Studio to Oracle Developer Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9715
 2024-08-14 13:29:17 -04:00
Brad King cf1bc1b937 Merge topic 'emacs-cmake-mode' 
8eb8e27fb2 cmake-mode.el: Use line-beginning-position instead of obsolete point-at-bol

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9714
 2024-08-14 13:25:29 -04:00
Felipe Torrezan 564d527c04 IAR: Improve error message for missing license 
When using the IAR Compiler without a license, CMake issues a
fatal error message about a missing linker and librarian.
This message is misleading.

In the previous detection, CMakeFindBinUtils.cmake would rely
on information collected from try_compile() which depends on a
working license.

In the new detection scheme, the IAR BinUtils are automatically
detected regardless of an existing license, based solely on the
compiler's path.

The failure point will be when trying to compile a C or a CXX
source file, where there will be no CMAKE_${lang}_COMPILER_VERSION
available.

This change improves the resulting message for when trying to use
the compiler without a license.
 2024-08-14 09:03:13 +02:00
Tudy Gourmelen 4b84596dcf Android: Fix condition detecting no APIs found in the NDK 
Fixes: #26210
 2024-08-14 08:16:24 +02:00
Kitware Robot b2b3c5825f CMake Nightly Date Stamp 2024-08-14 00:01:26 -04:00
Gold856 ea62c44b64 UseJava: Reduce add_jar verbosity by default 
Set "Clean class files" message to verbose.

Fixes: #22107
 2024-08-13 15:56:39 -04:00
Pierre Rouleau 8eb8e27fb2 cmake-mode.el: Use line-beginning-position instead of obsolete point-at-bol 
That fixes Emacs 29 warning:

    cmake-mode.el:186:48: Warning: ‘point-at-bol’ is an obsolete function
      (as of 29.1); use ‘line-beginning-position’ or ‘pos-bol’ instead.
 2024-08-13 15:50:51 -04:00
Christoph Grüninger f742c298a0 cppdap: include/dap/network.h: add <stdint.h> include for GCC 15 
GCC 15 requires the include for the declaration of `uint32_t`.
Backport [cppdap PR 133](https://github.com/google/cppdap/pull/133).
 2024-08-13 15:42:40 -04:00
Brad King f6745ed29f Merge branch 'upstream-cppdap' into update-cppdap 
# By cppdap Upstream
* upstream-cppdap:
  cppdap 2024-08-02 (c69444ed)
 2024-08-13 15:36:07 -04:00
cppdap Upstream bcfd096ed9 cppdap 2024-08-02 (c69444ed) 
Code extracted from:

    https://github.com/google/cppdap.git

at commit c69444ed76f7468b232ac4f989cb8f2bdc100185 (c69444ed76f7468b232ac4f989cb8f2bdc100185).
 2024-08-13 15:36:06 -04:00
Brad King 5098a08fde cppdap: Update script to get version as of 2024-08-02 2024-08-13 15:35:20 -04:00
Brad King 6b8ab3c282 expat: Hard-code configuration options for our needs 2024-08-13 15:22:45 -04:00
Brad King 25c2d60c04 Merge branch 'upstream-expat' into update-expat 
* upstream-expat:
  expat 2024-03-13 (fa75b965)
 2024-08-13 15:22:18 -04:00
Expat Upstream 865006f033 expat 2024-03-13 (fa75b965) 
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit fa75b96546c069d17b8f80d91e0f4ef0cde3790d (R_2_6_2).
 2024-08-13 15:16:12 -04:00
Brad King fc5bbb1f01 expat: Update script to get Expat 2.6.2 2024-08-13 15:16:02 -04:00
Brad King 7486f468fb curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error codes 
curl 8.7.x has a bug in HTTP/2 error codes introduced by
commit `0dc036225` (HTTP/2: write response directly, 2024-01-31,
`curl-8_7_0~230`) and fixed by commit `5c59f9142` (http2 + ngtcp2:
pass CURLcode errors from callbacks, 2024-04-18, `curl-8_8_0~181`).

Fixes: #26200
 2024-08-13 15:07:53 -04:00
Brad King 1a74f95656 file(DOWNLOAD): Fix User-Agent to use run-time curl version 
If CMake is linked to a system-provided curl shared library, the version
at run-time may not match the `LIBCURL_VERSION` at build time.  Look up
the run-time curl version to populate the User-Agent string.

This is particularly important since commit d3cbee99e3 (macOS: Prefer
building with system-provided curl, 2024-05-09, v3.30.0-rc1~130^2~1)
switched to building our official binaries on macOS against the system
provided curl shared library.

Fixes: #26209
 2024-08-13 14:14:10 -04:00
Brad King 88e90fcd20 Merge topic 'cuda_unity' 
b90ae10dda Add support for unity builds with CUDA sources
c99ff40b21 Unity: refactor unity extension logic to single function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9655
 2024-08-13 11:01:13 -04:00
Brad King fc0faeb34e Merge topic 'lfortran-link-info' 
509e8be784 LFortran: Add support for mixed-language linking with Fortran
cb6e8698ff CMakeParseImplicitLinkInfo: Refactor conditions to detect specific compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9700
 2024-08-13 10:58:47 -04:00