mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
70,306 Commits 2 Branches 385 Tags
3f8ad3e894cd3c19a2ca704f665966756d203db2
Commit Graph

70306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
3f8ad3e894 Tests: Simplify implementation of execute_process encoding test executable 
Replace use of KWSys ConsoleBuf with direct encoding conversion calls.
 2025-04-17 19:53:45 -04:00
Brad King
407363abd0 Merge topic 'argument-parser-trailing-positionals' 
df870e17f5 cmArgumentParser: Implement trailing positional args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10655
 2025-04-17 10:09:34 -04:00
Brad King
e78cf73b52 Merge topic 'makefile-progress' 
5781cf406f Makefile: Fix progress with non-excluded targets in excluded dirs
89ab14b05b cmGlobalGenerator: Constify IsExcluded use of cmLocalGenerator
0aabf32590 cmGeneratorExpression: Constify use of cmLocalGenerator
88f54fba43 cmLocalGenerator: Avoid unnecessary const-ness propagation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10658
 2025-04-17 10:00:51 -04:00
Brad King
3cc9b88eba Merge topic 'fileapi-reply-on-failure' 
0cc962665b fileapi: Generate partial reply when buildsystem generation fails
09aa968ed0 cmFileAPI: Add BuildReplyEntry wrapper around AddReplyIndexObject
5e0a644ee8 Tests/RunCMake/FileAPI: Explicitly specify expected reply index prefix
0a0bd69f4b Help: Polish cmake-file-api(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10652
 2025-04-17 09:59:20 -04:00
Kitware Robot
980b79ad1f CMake Nightly Date Stamp 2025-04-17 00:04:34 -04:00
Vito Gamberini
df870e17f5 cmArgumentParser: Implement trailing positional args 2025-04-16 14:15:48 -04:00
Brad King
ca9fa874d8 Merge topic 'nasm-find-compiler' 
f1b1b84b22 ASM_NASM: Honor ASM_NASM env var over standard NASM installation on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10662
 2025-04-16 09:52:44 -04:00
Brad King
cf77b8e3d1 Merge topic 'install-parallel' 
20858ddb29 CMake: Enable parallel install for CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10661
 2025-04-16 09:50:30 -04:00
Brad King
74c62a180d Merge topic 'empty_elseif_warning' 
2a8bc1c4aa if: Add warning when elseif has no argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !10643
 2025-04-16 09:40:23 -04:00
Brad King
503a7d73cd Merge branch 'release-4.0' 2025-04-16 09:38:29 -04:00
Brad King
2d04de2532 Merge topic 'macos-usr-local-lib' 
6e63080d39 macOS: Restore RPATH entry for libraries linked from /usr/local/lib
430174e65d CMakeDetermineCompilerABI: Comment implicit link directory exclusion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10663
 2025-04-16 09:38:29 -04:00
Brad King
e14d9b0f42 Merge topic 'macos-usr-local-lib' into release-4.0 
6e63080d39 macOS: Restore RPATH entry for libraries linked from /usr/local/lib
430174e65d CMakeDetermineCompilerABI: Comment implicit link directory exclusion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10663
 2025-04-16 09:38:27 -04:00
Brad King
afcb012bcb Merge branch 'release-4.0' 2025-04-16 09:37:09 -04:00
Brad King
9d1a0fa256 Merge topic 'normalize-input-paths' 
cd4e72ca08 Normalize PWD environment variable before using it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10659
 2025-04-16 09:37:09 -04:00
Brad King
699f45ae33 Merge topic 'normalize-input-paths' into release-4.0 
cd4e72ca08 Normalize PWD environment variable before using it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10659
 2025-04-16 09:37:07 -04:00
Brad King
6bbd572438 Merge topic 'patch-FindGLEW' 
714966fe42 FindGLEW: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10654
 2025-04-16 09:27:39 -04:00
Brad King
7a5ac016f1 Merge topic 'patch-FindMPEG' 
cea6119266 FindMPEG, FindMPEG2: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10656
 2025-04-16 09:18:29 -04:00
Brad King
7be87256a6 Merge topic 'patch-FindSDL' 
905d461431 Find_SDL*: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10657
 2025-04-16 09:10:58 -04:00
xndcn
5781cf406f Makefile: Fix progress with non-excluded targets in excluded dirs 
Fixes: #26871
 2025-04-16 09:04:17 -04:00
Kitware Robot
99ac7369d3 CMake Nightly Date Stamp 2025-04-16 00:07:14 -04:00
Peter Kokot
714966fe42 FindGLEW: Update documentation 
- Synced module documentation with other similar find modules.
- Added examples section.
- Moved imported targets section to the top.
- Added note about config mode.
- Added CMake versions, when some variables got introduced as many were
  added after the initial module.
 2025-04-15 22:41:48 +02:00
Brad King
6e63080d39 macOS: Restore RPATH entry for libraries linked from /usr/local/lib 
Since commit 7b19531291 (macOS: Do not pass any SDK/-isysroot to
compilers by default, 2024-11-06, v4.0.0-rc1~511^2) our default
invocation of compilers targeting macOS no longer passes `-isysroot`.
Without that, Xcode's compilers search `-L/usr/local/lib` by default
even though the macOS dynamic loader does not.  Since `/usr/local/lib`
is not a fully-implemented implicit link directory, exclude it from our
detected `CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES` so that our generators
do not suppress `RPATH` entries for dependencies in that directory.

Fixes: #26867
 2025-04-15 14:13:45 -04:00
Brad King
430174e65d CMakeDetermineCompilerABI: Comment implicit link directory exclusion 2025-04-15 14:13:45 -04:00
Brad King
7c15231c4f Merge topic 'update-kwsys' 
c64dad3136 Merge branch 'upstream-KWSys' into update-kwsys
a48e7a6735 KWSys 2025-04-15 (83715610)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10653
 2025-04-15 12:21:04 -04:00
Brad King
f1b1b84b22 ASM_NASM: Honor ASM_NASM env var over standard NASM installation on Windows 
Drop the custom `find_program` call in favor of the common
infrastructure.

Fixes: #26873
 2025-04-15 12:00:15 -04:00
Martin Duffy
20858ddb29 CMake: Enable parallel install for CMake itself 2025-04-15 11:41:06 -04:00
Aliochat
2a8bc1c4aa if: Add warning when elseif has no argument 
Resolves: #26442
 2025-04-15 10:58:25 -04:00
Brad King
89ab14b05b cmGlobalGenerator: Constify IsExcluded use of cmLocalGenerator 2025-04-15 10:44:32 -04:00
Brad King
0aabf32590 cmGeneratorExpression: Constify use of cmLocalGenerator 2025-04-15 10:43:32 -04:00
Brad King
88f54fba43 cmLocalGenerator: Avoid unnecessary const-ness propagation 2025-04-15 10:41:32 -04:00
Brad King
8b4971ec25 Merge topic 'patch-FindGnuTLS' 
6dff939916 FindGnuTLS: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10650
 2025-04-15 09:58:19 -04:00
Brad King
b3dd121aea Merge topic 'patch-FindKDE3' 
d7a4750c78 FindKDE3: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10651
 2025-04-15 09:56:46 -04:00
Brad King
c64dad3136 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2025-04-15 (83715610)
 2025-04-15 09:55:03 -04:00
KWSys Upstream
a48e7a6735 KWSys 2025-04-15 (83715610) 
Code extracted from:

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

at commit 837156100be4dd48a491b27ebe15ed915bab9a76 (master).

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

Brad King (1):
      cc3df2a3 Fix -Wswitch-default warnings in switch statements
 2025-04-15 09:55:03 -04:00
Brad King
ffec8739de Merge topic 'patch-FindCURL' 
2ab964c040 FindCURL: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10646
 2025-04-15 09:54:26 -04:00
Brad King
100587fcbc Merge topic 'patch-FindOpenSSL' 
8481204a0c FindOpenSSL: Fix version range documentation note

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10649
 2025-04-15 09:53:11 -04:00
Brad King
8f3d71b357 Merge topic 'patch-FindwxWindows' 
7ac1345f7f FindwxWindows: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10648
 2025-04-15 09:51:26 -04:00
Brad King
cb31aa3476 Merge topic 'doc-include-rst' 
9784834b4c Help: Use `*.rst` extension for included files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10615
 2025-04-15 09:42:51 -04:00
Brad King
23bc326b81 Merge topic 'diab-asm-test' 
e6e5ab6d00 Tests/RunCMake/Diab: Explicitly specify ASM compiler for asm test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10647
 2025-04-15 09:40:45 -04:00
Brad King
cd4e72ca08 Normalize PWD environment variable before using it 
In commit 5aed3ee49d (cmSystemTools: Add GetLogicalWorkingDirectory,
2024-10-28, v4.0.0-rc1~528^2~6) we incorrectly trusted `PWD` to be a
normalized path so long as its realpath matches the current working
directory.

Fixes: #26870
 2025-04-15 09:37:08 -04:00
Brad King
37cd60d72d Merge branch 'release-4.0' 2025-04-15 09:36:40 -04:00
Brad King
6c35c9ea22 Merge topic 'LINKER_FLAGS-CMP0181-OLD' 
2e9648e0de Ninja generator: restore correct encoding for policy CMP0181=OLD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10645
 2025-04-15 09:36:40 -04:00
Brad King
813f6c263e Merge topic 'LINKER_FLAGS-CMP0181-OLD' into release-4.0 
2e9648e0de Ninja generator: restore correct encoding for policy CMP0181=OLD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10645
 2025-04-15 09:36:38 -04:00
Peter Kokot
905d461431 Find_SDL*: Update documentation 
This updates the following modules:
- FindSDL
- FindSDL_gfx
- FindSDL_image
- FindSDL_mixer
- FindSDL_net
- FindSDL_sound
- FindSDL_ttf

Changes:
- Synced modules documentation.
- Added examples sections.
- Used the ``<PackageName>_FOUND`` variables. The uppercased
  ``<PACKAGENAME>_FOUND`` variables are also set to the same value as of
  CMake 3.3.
- Added notes regarding the CMake package configuration files
  provided by upstream distributions with separate imported targets.
- Find modules index sorted alphabetically for FindSDL* modules.
 2025-04-15 14:23:12 +02:00
Kitware Robot
05e77b8a27 CMake Nightly Date Stamp 2025-04-15 00:04:11 -04:00
Peter Kokot
cea6119266 FindMPEG, FindMPEG2: Update documentation 
- Modules documentation updated and synced.
- Added examples section.
- FindMPEG and FindMPEG2 modules behave very much the same except that
  FindMPEG2 also adds the SDL library as a dependency. Added notes
  regarding this and recommended to use the FindMPEG2 as it also links
  in the SDL library at the time of writing.
 2025-04-15 02:29:36 +02:00
Brad King
0cc962665b fileapi: Generate partial reply when buildsystem generation fails 
In particular, the `configureLog` reply is useful for IDEs to read
`CMakeFiles/CMakeConfigureLog.yaml` when configuration fails.

Fixes: #26621
 2025-04-14 10:42:03 -04:00
Brad King
09aa968ed0 cmFileAPI: Add BuildReplyEntry wrapper around AddReplyIndexObject 2025-04-14 09:34:22 -04:00
Brad King
5e0a644ee8 Tests/RunCMake/FileAPI: Explicitly specify expected reply index prefix 2025-04-14 09:34:22 -04:00
Brad King
0a0bd69f4b Help: Polish cmake-file-api(7) manual 
Re-order some bullets to list the success case first.
Also remove a repeated word.
 2025-04-14 09:33:38 -04:00