mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-24 09:09:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
65,544 Commits 2 Branches 403 Tags
89aac1fbe8b46856f1a8cfdb0f59953643f1bf83
Commit Graph

65544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Ramos 89aac1fbe8 add_dependencies: Document behavior under Ninja generators 
Closes: #25796
 2024-03-28 09:48:08 -07:00
Kitware Robot 2e3692bde0 CMake Nightly Date Stamp 2024-03-28 00:01:13 -04:00
Brad King 1ff6c1eecf Merge branch 'release-3.29' 2024-03-27 08:18:10 -04:00
Brad King cf6083cc6e Merge topic 'doc-linker-vars' 
6ba2bbc0f3 Help: Restructure and improve LINKER_TYPE docs
c39bc6e412 Help: CMAKE_<LANG>_USING_LINKER_<TYPE> can be a list of flags
1c7ccefd83 Help: Add custom linker example for CMAKE_<LANG>_USING_LINKER_<TYPE>
aecea7b28b Help: Grammar, typos and wording improvements for linker variables
5b21897c6e Help: Remove stray formatting for try_compile() LINKER_LANGUAGE keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9362
 2024-03-27 08:18:10 -04:00
Brad King 9dc7d28f70 Merge topic 'doc-linker-vars' into release-3.29 
6ba2bbc0f3 Help: Restructure and improve LINKER_TYPE docs
c39bc6e412 Help: CMAKE_<LANG>_USING_LINKER_<TYPE> can be a list of flags
1c7ccefd83 Help: Add custom linker example for CMAKE_<LANG>_USING_LINKER_<TYPE>
aecea7b28b Help: Grammar, typos and wording improvements for linker variables
5b21897c6e Help: Remove stray formatting for try_compile() LINKER_LANGUAGE keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9362
 2024-03-27 08:18:09 -04:00
Brad King 3d9351717c Merge branch 'release-3.29' 2024-03-27 08:17:07 -04:00
Brad King 6f8cb8f988 Merge topic 'FindPkgConfig-no-Strawberry-Perl' 
d0dd134bdb FindPkgConfig: Avoid finding Strawberry Perl's pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9375
 2024-03-27 08:17:06 -04:00
Brad King d0272bea04 Merge topic 'FindPkgConfig-no-Strawberry-Perl' into release-3.29 
d0dd134bdb FindPkgConfig: Avoid finding Strawberry Perl's pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9375
 2024-03-27 08:17:05 -04:00
Brad King 209c0ff56c Merge topic 'patch-find-sqlite3' 
fb30b18437 FindSQLite3: Use pkg-config for SQLite3 hints

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9374
 2024-03-27 08:15:37 -04:00
Kitware Robot c3695c6b38 CMake Nightly Date Stamp 2024-03-27 00:01:15 -04:00
Brad King 6fa8eecfd0 Merge branch 'release-3.29' 2024-03-26 09:07:24 -04:00
Brad King be7c1d1cfa Merge branch 'release-3.28' 2024-03-26 09:07:22 -04:00
Brad King d26526a36f Merge branch 'release-3.28' into release-3.29 2024-03-26 09:07:16 -04:00
Brad King e37ed71c86 Merge branch 'release-3.29' 2024-03-26 09:06:21 -04:00
Brad King e6f1dd3106 Merge topic 'libuv-macos-10.5' 
e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9371
 2024-03-26 09:06:21 -04:00
Brad King 8b832b353c Merge topic 'libuv-macos-10.5' into release-3.29 
e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9371
 2024-03-26 09:06:20 -04:00
Brad King 8fd4110d55 Merge topic 'libuv-macos-10.5' into release-3.28 
e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9371
 2024-03-26 09:05:32 -04:00
Brad King c90bcf58ee Merge topic 'FindCURL-libcurl_a' 
a76aad6ca6 FindCURL: Add support for finding static `libcurl_a.lib` on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9367
 2024-03-26 09:01:01 -04:00
Brad King d0dd134bdb FindPkgConfig: Avoid finding Strawberry Perl's pkg-config 
Strawberry Perl may be in the `PATH` to provide `perl`, but it also
comes with a `pkg-config` tool that is unrelated to normal MinGW
distributions.  Since commit c6efbd78d8 (MSVC: Teach find_library to
consider the 'libfoo.a' naming convention, 2024-01-19, v3.29.0-rc1~91^2)
we need to avoid searching Strawberry Perl's `.../c/lib` directory, so
do not let its `pkg-config` point us there.

Fixes: #25820
Issue: #23975
 2024-03-26 08:51:32 -04:00
Peter Kokot fb30b18437 FindSQLite3: Use pkg-config for SQLite3 hints 2024-03-26 13:08:00 +01:00
Brad King 41de1c3813 Merge topic 'swift-color-diagnostics' 
ff7a09d719 Swift: Honor CMAKE_COLOR_DIAGNOSTICS for command-line build systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9365
 2024-03-26 07:56:12 -04:00
Brad King 60de0b410e Merge topic 'open-watcom' 
71d3aa1499 OpenWatcom: Fix Windows3x DLL linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9370
 2024-03-26 07:55:18 -04:00
Kitware Robot 4f73a9b74e CMake Nightly Date Stamp 2024-03-26 00:01:12 -04:00
Craig Scott 6ba2bbc0f3 Help: Restructure and improve LINKER_TYPE docs 2024-03-26 08:03:14 +11:00
Craig Scott c39bc6e412 Help: CMAKE_<LANG>_USING_LINKER_<TYPE> can be a list of flags 2024-03-26 08:03:14 +11:00
Craig Scott 1c7ccefd83 Help: Add custom linker example for CMAKE_<LANG>_USING_LINKER_<TYPE> 2024-03-26 08:03:14 +11:00
Craig Scott aecea7b28b Help: Grammar, typos and wording improvements for linker variables 2024-03-26 08:03:14 +11:00
Alex Overchenko a76aad6ca6 FindCURL: Add support for finding static libcurl_a.lib on Windows 
Fixes: #25810
 2024-03-25 15:31:30 -04:00
Evan Wilde ff7a09d719 Swift: Honor CMAKE_COLOR_DIAGNOSTICS for command-line build systems 
Add the missing flags to enable and disable color diagnostics for Swift.

Fixes: #25815
 2024-03-25 15:06:13 -04:00
Jiri Malak 71d3aa1499 OpenWatcom: Fix Windows3x DLL linking 
Fix DLL creation for 16-bit Windows.
 2024-03-25 14:49:50 -04:00
Brad King e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8 
Since libuv commit `83efa3dd71` (Reland "macos: use posix_spawn instead
of fork", 2022-03-02, v1.44.0~10), `uv_spawn` on macOS < 10.8
has been observed to cause kernel panics and/or resource exhaustion.
This became particularly noticeable in CMake since commit 5420639a8d
(cmExecuteProcessCommand: Replace cmsysProcess with cmUVProcessChain,
2023-06-01, v3.28.0-rc1~138^2~8).  Prefer `fork` over `posix_spawn` in
libuv when targeting macOS < 10.8.

Fixes: #25414
Fixes: #25818
Inspired-by: Ken Cunningham <kencu@macports.org>
 2024-03-25 12:11:57 -04:00
Brad King 32d05fab78 Merge branch 'release-3.29' 2024-03-25 10:51:17 -04:00
Brad King b5bb6f7a6d Merge topic 'IntelLLVM-Fortran-no-isystem' 
a80d8e839d IntelLLVM: Revert accidental use of -external:I with Fortran compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9368
 2024-03-25 10:51:16 -04:00
Brad King 245fa4760c Merge topic 'IntelLLVM-Fortran-no-isystem' into release-3.29 
a80d8e839d IntelLLVM: Revert accidental use of -external:I with Fortran compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9368
 2024-03-25 10:51:15 -04:00
Kitware Robot 57f50abdc4 CMake Nightly Date Stamp 2024-03-25 00:03:15 -04:00
Brad King a80d8e839d IntelLLVM: Revert accidental use of -external:I with Fortran compilers 
In commit 8218aed118 (IntelLLVM: support marking include paths as SYSTEM
directories, 2023-08-15, v3.29.0-rc1~81^2) this flag was added for the C
and C++ compilers, but was accidentally added for Fortran too.  Remove
it for the latter, as it is unsupported.

Issue: #25807
 2024-03-24 15:03:11 -04:00
Brad King 729d904050 Merge topic 'cpack-wix' 
d15c910a45 CPack/WIX: Remove "candle" from tool-agnostic error message
ac25c645a7 CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansion
54d09a2b3f CPack/WIX: Document WiX Toolset v3 tools
d2f4836f8e CPack/WIX: Prepare to provide version-specific WiX templates
438809d3ba cmCPackGenerator: Add option to FindTemplate to use alternate builtin path
4d661e3a92 cmMakefile: Reduce GetModulesFile caller allocations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9363
 2024-03-24 14:35:14 -04:00
Brad King 7c326643ad Merge topic 'file-RPATH-large-ELF' 
615a1c6691 cmELF: Get correct section count for large ELF binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9310
 2024-03-24 14:34:23 -04:00
Brad King 7f7105aa2c Merge branch 'release-3.29' 2024-03-24 14:33:31 -04:00
Brad King 899af83755 Merge topic 'linker-vars-propagate-try_compile' 
98cc86e265 try_compile(): Include languages with _ or - when passing linker vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9361
 2024-03-24 14:33:31 -04:00
Brad King 78e89edab4 Merge topic 'linker-vars-propagate-try_compile' into release-3.29 
98cc86e265 try_compile(): Include languages with _ or - when passing linker vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9361
 2024-03-24 14:33:30 -04:00
Craig Scott dbe05e4d7c Merge topic 'doc-tool' 
be6763f34b Help: cmake(1) --toolchain path relative

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9364
 2024-03-24 07:14:55 -04:00
Kitware Robot 6cddfdf974 CMake Nightly Date Stamp 2024-03-24 00:01:12 -04:00
Kitware Robot 86b55fd236 CMake Nightly Date Stamp 2024-03-23 00:01:13 -04:00
scivision be6763f34b Help: cmake(1) --toolchain path relative 
other cmake(1) options are relative to cwd. It is surprising
enough that --toolchain is relative to -B or -S that it's
good to call it out here too.
 2024-03-22 17:17:31 -04:00
Martin Duffy 615a1c6691 cmELF: Get correct section count for large ELF binaries 
Fixes: #24877
 2024-03-22 10:18:06 -04:00
Brad King d15c910a45 CPack/WIX: Remove "candle" from tool-agnostic error message 2024-03-22 09:58:42 -04:00
Brad King ac25c645a7 CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansion 2024-03-22 09:58:42 -04:00
Brad King 54d09a2b3f CPack/WIX: Document WiX Toolset v3 tools 
Add a dedicated section describing the `candle` and `light` tools.
Also improve formatting of some variables' documentation.
 2024-03-22 09:58:37 -04:00
Brad King d2f4836f8e CPack/WIX: Prepare to provide version-specific WiX templates 
Move our template for WiX Toolset v3 to a versioned location.
 2024-03-22 09:51:06 -04:00