mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-17 20:50:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
65,022 Commits 2 Branches 390 Tags
04d8bc6bb9727b667b8a0d339c7803befce337f2
Commit Graph

65022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
04d8bc6bb9 Merge topic 'ctest-j-default' into release-3.29 
5de1e21659 ctest: Allow passing -j without value to choose a contextual default
bbcbcff7d9 cmCTestMultiProcessHandler: Modernize member initialization
7457b474a1 Tests: Remove unnecessary parallel suppression from CTestCoverageCollectGCOV
ae69801d96 Tests: Convert CTestTestSkipReturnCode to RunCMake.ctest_test case
30dda49416 Tests: Convert CTestTestSerialOrder to RunCMake.ctest_test case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9315
 2024-03-11 10:18:49 -04:00
Brad King
da334e2db9 Merge topic 'ctest-tests-from-file' into release-3.29 
170ec48601 Help: Improve ctest tests-from-file documentation wording and wrapping
1a4837641e ctest: Remove unnecessary and ambiguous tests-from-file comment syntax
d52c66bfb3 ctest: Honor tests-from-file options with empty input
8673264e25 Tests: Make ctest tests-from-file expected output more precise

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9322
 2024-03-11 10:16:59 -04:00
Brad King
d914c76d63 Merge topic 'llvm-objdump' into release-3.29 
c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9325
 2024-03-11 10:15:16 -04:00
Brad King
a22245a97f Merge topic 'marmasm-language' into release-3.29 
c34ef6c922 ASM_MARMASM: Remove broken partial support for preprocessor defines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9326
 2024-03-11 10:10:55 -04:00
Brad King
5de1e21659 ctest: Allow passing -j without value to choose a contextual default 
Under job server integration, added by commit 80fe56c481 (ctest: Add
support for running under a make job server on POSIX systems,
2023-11-15, v3.29.0-rc1~324^2), use a very high default so that
parallelism is effectively limited only by available job server tokens.

Otherwise, choose a default limit based on the number of processors.

Also allow passing `0` to specify unbounded parallelism.

Fixes: #25739
 2024-03-10 11:41:39 -04:00
Alexander Neumann
c34ef6c922 ASM_MARMASM: Remove broken partial support for preprocessor defines 
Avoid passing unsupported options to the assembler.

In commit 3166547cf6 (ASM_MARMASM: Add support for Microsoft ARM
assembler language, 2022-10-14, v3.26.0-rc1~383^2) we copied the
assembler command line from `CMakeASM_MASMInformation`, but the
`marmasm` tool does not accept `-D` command-line options.

Issue: #24317
 2024-03-10 11:20:20 -04:00
Adrian Pop
c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:" 
LLVM's `llvm-objdump` has spaces before "DLL Name:" instead of tabs.
 2024-03-10 11:03:21 -04:00
Brad King
bbcbcff7d9 cmCTestMultiProcessHandler: Modernize member initialization 2024-03-10 10:27:05 -04:00
Brad King
7457b474a1 Tests: Remove unnecessary parallel suppression from CTestCoverageCollectGCOV 
This hasn't been necessary since commit ab7eda2591 (Tests: Remove
unnecessary pass regex on CTestCoverageCollectGCOV, 2020-04-29,
v3.18.0-rc1~239^2~2).
 2024-03-10 10:27:02 -04:00
Brad King
ae69801d96 Tests: Convert CTestTestSkipReturnCode to RunCMake.ctest_test case 2024-03-10 10:26:14 -04:00
Brad King
30dda49416 Tests: Convert CTestTestSerialOrder to RunCMake.ctest_test case 2024-03-10 10:24:50 -04:00
Brad King
170ec48601 Help: Improve ctest tests-from-file documentation wording and wrapping 2024-03-08 16:26:12 -05:00
Brad King
1a4837641e ctest: Remove unnecessary and ambiguous tests-from-file comment syntax 
Test names can contain `#`.  Since we ignore lines that do not match any
test names anyway, "commenting" can still work without explicit syntax.
Also drop whitespace trimming for similar reasons.

Fixes: #25741
 2024-03-08 16:25:33 -05:00
Brad King
d52c66bfb3 ctest: Honor tests-from-file options with empty input 
If the `--tests-from-file` input file is empty, no tests should run.
 2024-03-08 16:06:35 -05:00
Brad King
8673264e25 Tests: Make ctest tests-from-file expected output more precise 2024-03-08 16:03:48 -05:00
Brad King
5c3512333c Merge branch 'release-3.28' into release-3.29 2024-03-08 09:33:24 -05:00
Brad King
74d3765c2d Merge topic 'cxxmodules-target-objects' into release-3.29 
4ddf0453d5 Tests/CXXModules: add a test using `TARGET_OBJECTS` from modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9316
 2024-03-08 09:32:36 -05:00
Brad King
9bfb972c25 Merge topic 'cxxmodules-target-objects' into release-3.28 
4ddf0453d5 Tests/CXXModules: add a test using `TARGET_OBJECTS` from modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9316
 2024-03-08 09:32:01 -05:00
Brad King
23e7c9a42a Merge topic 'doc-https' into release-3.29 
53a542936e Help: Convert http URLs to https

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9313
 2024-03-08 09:30:12 -05:00
Brad King
d68cf1553d Merge topic 'ctest-tests-from-file' into release-3.29 
ca0a9def2e ctest: Exit with failure when tests-from-file input is missing
60433fc6e8 Tests: Generalize ctest tests-from-file test cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9317
 2024-03-08 09:28:44 -05:00
scivision
53a542936e Help: Convert http URLs to https 2024-03-07 09:42:45 -05:00
Brad King
ca0a9def2e ctest: Exit with failure when tests-from-file input is missing 
If the options added by

* commit 022f20f663 (ctest: add command line option to run the tests listed
                     in a given file, 2023-11-29, v3.29.0-rc1~66^2~2)
* commit dbacc1d5a8 (ctest: add command line option to exclude tests listed
                     in a given file, 2023-11-30, v3.29.0-rc1~66^2~1)
* commit 701029726f (ctest_test: add options INCLUDE_FROM_FILE and
                     EXCLUDE_FROM_FILE, 2023-12-03, v3.29.0-rc1~66^2)

are given a missing file, fail instead of ignoring it.

Fixes: #25740
 2024-03-06 16:14:04 -05:00
Brad King
60433fc6e8 Tests: Generalize ctest tests-from-file test cases 2024-03-06 13:34:10 -05:00
Ben Boeckel
4ddf0453d5 Tests/CXXModules: add a test using TARGET_OBJECTS from modules 
See: #25732
 2024-03-06 12:34:46 -05:00
Brad King
dd8e84a8fa Merge topic 'FindRuby-3.3' into release-3.29 
c2bf3e46fa FindRuby: Fix finding Ruby 3.1+ on Windows
867550db43 FindRuby: Add support for 3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9309
 2024-03-06 09:00:19 -05:00
Charlie Savage
c2bf3e46fa FindRuby: Fix finding Ruby 3.1+ on Windows 
It switched to the UCRT C runtime.
 2024-03-05 08:47:59 -05:00
Charlie Savage
867550db43 FindRuby: Add support for 3.3 2024-03-05 08:46:29 -05:00
Brad King
965acca98c CMake 3.29.0-rc3 v3.29.0-rc3 2024-03-04 13:58:26 -05:00
Brad King
68240e7e49 Merge branch 'release-3.28' into release-3.29 2024-03-04 10:21:32 -05:00
Brad King
37ddb04738 Merge topic 'cxxmodules-invalid-iterator' into release-3.29 
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9303
 2024-03-04 10:20:47 -05:00
Brad King
944f10d768 Merge topic 'cxxmodules-invalid-iterator' into release-3.28 
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9303
 2024-03-04 10:19:34 -05:00
Ben Boeckel
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field 
Also avoids usage of an invalid `importit` when module names are not
available.
 2024-03-01 11:23:44 -05:00
Brad King
4c0ea43c09 Merge branch 'release-3.28' into release-3.29 2024-03-01 09:00:38 -05:00
Brad King
e80ad5809b Merge topic 'FindTIFF-cmake-package' into release-3.29 
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
 2024-03-01 08:59:50 -05:00
Brad King
d16ac6f801 Merge topic 'FindTIFF-cmake-package' into release-3.28 
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
 2024-03-01 08:59:04 -05:00
Brad King
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package 
Since commit 6a3059e66f (FindTIFF: bridge `tiff-config` into
FindTIFF-compatible interface, 2023-09-14, v3.28.0-rc1~87^2)
we try to find the upstream TIFF cmake package.  However, it
is called `TiffConfig.cmake`, not `tiff-config.cmake`, so we
need to match the capitalization of the package name.
 2024-02-29 08:47:53 -05:00
Brad King
966e6afd36 Merge branch 'release-3.28' into release-3.29 2024-02-29 08:05:33 -05:00
Brad King
cb2dc012c0 Merge topic 'cxxmodules-no-export-basedirs-as-include-paths' into release-3.29 
65bd837786 Merge branch 'backport-3.28-cxxmodules-no-export-basedirs-as-include-paths'
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9295
 2024-02-29 08:02:28 -05:00
Brad King
81a8cf2410 Merge topic 'cxxmodules-no-export-basedirs-as-include-paths' into release-3.28 
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9295
 2024-02-29 08:01:22 -05:00
Brad King
8a0d42d15e Merge topic 'Help-add_custom_command-grammo' into release-3.29 
b03356f954 Help/add_custom_command: fix verb grammo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9297
 2024-02-29 07:59:27 -05:00
Brad King
d00af79a7f Merge branch 'release-3.28' into release-3.29 2024-02-28 15:02:36 -05:00
Brad King
7f2275c65d Merge topic 'test-cxxmodules-vs' into release-3.29 
6925978f3e Tests/RunCMake/CXXModules: Update VS circular error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9299
 2024-02-28 15:01:36 -05:00
Brad King
6fa3cf4629 Merge topic 'test-cxxmodules-vs' into release-3.28 
6925978f3e Tests/RunCMake/CXXModules: Update VS circular error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9299
 2024-02-28 15:01:06 -05:00
Brad King
6925978f3e Tests/RunCMake/CXXModules: Update VS circular error message 
Match the message expected from MSBuild as of VS 17.9.
 2024-02-28 14:16:20 -05:00
Ben Boeckel
b03356f954 Help/add_custom_command: fix verb grammo 2024-02-28 13:21:52 -05:00
Brad King
65bd837786 Merge branch 'backport-3.28-cxxmodules-no-export-basedirs-as-include-paths' 2024-02-28 09:20:15 -05:00
Ben Boeckel
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets 2024-02-28 05:26:10 -05:00
Brad King
5ac8368922 Merge topic 'Help-file-ARCHIVE_EXTRACT-mention-working-dir' into release-3.29 
189d28d77d Help/file: mention the working directory for `ARCHIVE_EXTRACT`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9291
 2024-02-27 09:11:42 -05:00
Brad King
fe82cd6900 Merge branch 'release-3.28' into release-3.29 2024-02-27 09:08:02 -05:00
Brad King
4ff4417b54 Merge topic 'cxxmodules-fileset-cache-fullpath' into release-3.29 
0a18f9baad cmGeneratorTarget: collapse paths before querying the fileset cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9286
 2024-02-27 09:06:24 -05:00