mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 21:00:17 -06:00
Code Issues Packages Projects Releases Wiki Activity
59,978 Commits 2 Branches 385 Tags
136622a2b20ee36808cdf4e8dc2bf64fdf7e2f07
Commit Graph

59978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Lapenkou
136622a2b2 file(GET_RUNTIME_DEPENDENCIES): propagate transitive parent's rpath 
This fixes incorrect runtime dependency resolution when the dependency
is located in rpaths of a transitive parent.  Instead of supplying only
the rpaths of the immediate parent, it combines the rpaths of all
transitive parents and passes them down.

Fixes: #24172
 2022-12-02 09:00:06 -05:00
Brad King
4aa3149c67 Tests: Simplify RunCMake.file-GET_RUNTIME_DEPENDENCIES case cleaning 2022-11-29 17:47:38 -05:00
Brad King
c5a945dce8 Merge topic 'vs-build-parallel' 
48db261e69 cmake --build: Use both inter- and intra-project parallelism with msbuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7926
 2022-11-17 08:15:54 -05:00
Brad King
14cf3b1039 Merge topic 'file-archive-zstd-compression-level' 
ed519b1cba file(ARCHIVE_CREATE): Allow higher compression level for Zstd

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7924
 2022-11-17 08:15:04 -05:00
Brad King
d3b361c43b Merge topic 'automoc-var-init' 
70c721befb AutoMoc: Don't initialize already defined CMAKE_AUTOMOC_ variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7922
 2022-11-17 08:13:40 -05:00
Brad King
d183038b68 Merge topic 'compiler-predefines-only-cxx' 
d538cb0e18 Only initialize CMAKE_CXX_COMPILER_PREDEFINES_COMMAND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7923
 2022-11-17 08:12:27 -05:00
Brad King
a1099f7f7e Merge branch 'release-3.25' 2022-11-17 08:07:27 -05:00
Brad King
926d26fdb0 Merge branch 'release-3.24' 2022-11-17 08:07:26 -05:00
Brad King
3e2b3f6639 Merge branch 'release-3.24' into release-3.25 2022-11-17 08:07:15 -05:00
Brad King
daa2fc5833 Merge branch 'test-FindBoost-python-versions' into release-3.24 
Merge-request: !7929
 2022-11-17 08:06:36 -05:00
Brad King
fbad2102d5 Merge branch 'release-3.25' 2022-11-17 08:06:19 -05:00
Brad King
311695e319 Merge topic 'test-FindBoost-python-versions' 
6b1f933cb8 Tests: Update FindBoost.TestPython for Python 3.11 and 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7929
 2022-11-17 08:06:19 -05:00
Brad King
818ea1e497 Merge topic 'test-FindBoost-python-versions' into release-3.25 
6b1f933cb8 Tests: Update FindBoost.TestPython for Python 3.11 and 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7929
 2022-11-17 08:06:18 -05:00
Kitware Robot
148be2e2f2 CMake Nightly Date Stamp 2022-11-17 00:01:10 -05:00
Brad King
6b1f933cb8 Tests: Update FindBoost.TestPython for Python 3.11 and 3.12 
Follow up the python 3.11 and 3.12 support from:

* commit 43844c5d82 (FindPython: Add support for Python 3.11,
                     2021-12-07, v3.22.2~20^2)
* commit ca2877c039 (FindPython: add support for Python 3.12,
                     2022-05-11, v3.23.2~15^2)

with an update for the FindBoost test.
 2022-11-16 14:34:07 -05:00
Brad King
d22a225251 Merge branch 'release-3.25' 2022-11-16 10:20:22 -05:00
Brad King
13e46189c7 CMake 3.25.0 v3.25.0 2022-11-16 09:42:03 -05:00
Brad King
48db261e69 cmake --build: Use both inter- and intra-project parallelism with msbuild 
Since commit 1ab3881ec9 (cmake: Add options for parallel builds to
--build mode, 2018-04-14, v3.12.0-rc1~42^2), `cmake --build --parallel`
has added two options to the msbuild command line:

* `/m` enables inter-project parallelism in msbuild.
* `/p:CL_MPCount=1` suppresses intra-project parallelism in cl.

The latter was used to avoid `O(N^2)` compilation threads on `N`
processors.  In practice however, projects often have many source files
in a few targets, so `--parallel` actually reduces parallelism.

Drop the latter option to restore intra-project parallelism.
Users can always add `-- /p:CL_MPCount=1` themselves.

Fixes: #20564
 2022-11-16 09:38:41 -05:00
Brad King
d59f861e42 Merge topic 'test-genex-TARGET_PROPERTY' 
11b21ae14a Tests: Move some cases to RunCMake.GenEx-TARGET_PROPERTY
a4d0e4ff8f Tests: Prepare RunCMake.GenEx-TARGET_PROPERTY for more independent cases
e855ed7fde Tests: Rename RunCMake.TargetPropertyGeneratorExpressions for consistency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7918
 2022-11-16 09:37:06 -05:00
Brad King
48d52c2cfe Merge topic 'file-copy-error-path' 
89b144789d file(COPY_FILE): Report if failure occurred on input or output path
91dd7898ee Merge branch 'upstream-KWSys' into file-copy-error-path
a9c659b1b6 KWSys 2022-11-15 (6c92b9b0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7916
 2022-11-16 09:36:29 -05:00
Brad King
ad02e67a89 Merge topic 'FindPython-enhance-SOABI' 
328d847f70 FindPython: enhance SOABI computation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7917
 2022-11-16 09:35:42 -05:00
Amir Masoud Abdol
ed519b1cba file(ARCHIVE_CREATE): Allow higher compression level for Zstd 
This allows the Zstd compression-level to be set between 0-19.  I've
adjusted some of the tests, and error messages to indicates the selected
algorithm, and min/max of its compression-level.

Fixes: #24160
 2022-11-16 09:15:01 -05:00
Brad King
e2f12b6c8b Merge branch 'release-3.25' 2022-11-16 08:59:14 -05:00
Brad King
7621eec766 Merge topic 'qtifw-4.5' into release-3.25 
351239b776 CPack/IFW: Add support for QtIFW 4.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7920
 2022-11-16 08:59:13 -05:00
Brad King
c5a94e730a Merge topic 'qtifw-4.5' 
351239b776 CPack/IFW: Add support for QtIFW 4.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7920
 2022-11-16 08:59:13 -05:00
Brad King
facd621db2 Merge branch 'release-3.25' 2022-11-16 08:57:04 -05:00
Brad King
b686b58208 Merge topic 'cmp0141-pch-reuse' 
94164ea55e CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7914
 2022-11-16 08:57:04 -05:00
Brad King
23183a6ad7 Merge topic 'cmp0141-pch-reuse' into release-3.25 
94164ea55e CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7914
 2022-11-16 08:57:03 -05:00
Joerg Bornemann
d538cb0e18 Only initialize CMAKE_CXX_COMPILER_PREDEFINES_COMMAND 
Don't initialize the other CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND
variables.

The only language variant that is used is
CMAKE_CXX_COMPILER_PREDEFINES_COMMAND, and the other language variants
contained invalid, namely C++-specific commands.

Fixes: #23968
 2022-11-16 13:08:31 +01:00
Joerg Bornemann
70c721befb AutoMoc: Don't initialize already defined CMAKE_AUTOMOC_ variables 
Setting the variables CMAKE_AUTOGEN_ORIGIN_DEPENDS,
CMAKE_AUTOMOC_COMPILER_PREDEFINES, and CMAKE_AUTOMOC_MACRO_NAMES on the
cmake command line did not work as expected. CMakeGenericSystem.cmake
initialized these variables even if they were defined by the user.

This led to the confusing situation where the cache variant of a
variable had one value (defined on the command line) and the non-cache
variant of a variable had a different value (defined in
CMakeGenericSystem.cmake).

Fix this by checking whether the variables are defined before setting
their default values.

Fixes: #24069
 2022-11-16 10:38:53 +01:00
Kitware Robot
b7ab39bf59 CMake Nightly Date Stamp 2022-11-16 00:01:11 -05:00
Erlend E. Aasland
351239b776 CPack/IFW: Add support for QtIFW 4.5 
Fixes: #24164
 2022-11-15 16:30:50 -05:00
Marc Chevrier
328d847f70 FindPython: enhance SOABI computation 
Fixes: #24121, #23651
 2022-11-15 16:54:44 +01:00
Brad King
11b21ae14a Tests: Move some cases to RunCMake.GenEx-TARGET_PROPERTY 
Move some `TARGET_PROPERTY` cases from `RunCMake.GeneratorExpression`.
 2022-11-15 10:45:21 -05:00
Brad King
a4d0e4ff8f Tests: Prepare RunCMake.GenEx-TARGET_PROPERTY for more independent cases 
The existing cases all need to enable a language.  Move this out of the
`CMakeLists.txt` file and into the individual cases to make room for
other cases that may not need this.
 2022-11-15 10:34:00 -05:00
Brad King
e855ed7fde Tests: Rename RunCMake.TargetPropertyGeneratorExpressions for consistency 
Rename the test to `RunCMake.GenEx-TARGET_PROPERTY` for consistency with
the other `RunCMake.GenEx-*` test names.
 2022-11-15 10:24:07 -05:00
Brad King
88c4006f05 Merge topic 'ci-continuous' 
6cf026ab06 ci: add macos-x86_64-ninja build and test jobs to continuous pipeline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7915
 2022-11-15 10:02:30 -05:00
Brad King
89b144789d file(COPY_FILE): Report if failure occurred on input or output path 
When we know whether a failure was associated with the input or the
output path, include this information in the error message.
 2022-11-15 09:28:45 -05:00
Brad King
91dd7898ee Merge branch 'upstream-KWSys' into file-copy-error-path 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-11-15 (6c92b9b0)
 2022-11-15 09:28:34 -05:00
KWSys Upstream
a9c659b1b6 KWSys 2022-11-15 (6c92b9b0) 
Code extracted from:

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

at commit 6c92b9b0e7a57380a86c5dc4a50fe633b72fe66a (master).

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

Brad King (1):
      30e10c87 SystemTools: Report with copy operation failures which path failed
 2022-11-15 09:28:33 -05:00
Brad King
6cf026ab06 ci: add macos-x86_64-ninja build and test jobs to continuous pipeline 2022-11-15 09:21:58 -05:00
Brad King
0ebee2a14b Merge topic 'ci-openmp-macos' 
7ef3638454 ci: Enable FindOpenMP tests on macOS Ninja and Makefiles jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7912
 2022-11-15 09:14:46 -05:00
Brad King
eda68d229d Merge topic 'cmake-E-copy-t-mode' 
8d9069e5b6 cmake -E copy: Add support for -t argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7913
 2022-11-15 09:14:07 -05:00
Brad King
cf0f704683 Merge topic 'clang-tidy-module-ostringstream-check' 
0880114ada clang-tidy: disable ostringstream check
75ab77ee19 clang-tidy module: add test for ostringstream check
04638e7358 clang-tidy module: add check for ostringstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7911
 2022-11-15 09:12:50 -05:00
Brad King
3379723239 Merge topic 'test-isolate-ctest-env' 
e46a9d79fc Tests: Isolate more RunCMake cases from external ctest environment values
3b6c1c1a3b Tests: Factor out RunCMake ctest environment isolation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7909
 2022-11-15 09:11:10 -05:00
Brad King
6f9544736a Merge topic 'better_handling_of_build_args' 
01611f8258 cmake: --build improve detection of no build dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7908
 2022-11-15 08:55:19 -05:00
Brad King
5dbc7be0da Merge topic 'legacy' 
a44d415ed3 CMakeDetermineSystem: use execute_process() vs. exec_program()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7884
 2022-11-15 08:53:50 -05:00
Brad King
82e49021fe Merge topic 'top-level-command-order' 
59573bf5b9 project: Warn at top-level if `cmake_minimum_required` wasn't called
23f3dd9f7c RunCMake/project: Ignore exact line number in stderr checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7902
 2022-11-15 08:51:20 -05:00
Brad King
e58936fd6d Merge topic 'lcc-cleanup' 
84eebdf18e Tests: Teach CheckSourceTree test to clean up more specific known files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7907
 2022-11-15 08:49:41 -05:00
Kyle Edwards
8d9069e5b6 cmake -E copy: Add support for -t argument 
Fixes: #23543
 2022-11-15 07:47:07 -05:00