summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmSystemTools: Remove unused CopySingleFile overloadBrad King2022-11-172-9/+0
|
* Merge topic 'vs-build-parallel'Brad King2022-11-171-2/+0
|\ | | | | | | | | | | | | 48db261e69 cmake --build: Use both inter- and intra-project parallelism with msbuild Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7926
| * cmake --build: Use both inter- and intra-project parallelism with msbuildBrad King2022-11-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'file-archive-zstd-compression-level'Brad King2022-11-175-9/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | file(ARCHIVE_CREATE): Allow higher compression level for ZstdAmir Masoud Abdol2022-11-165-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'automoc-var-init'Brad King2022-11-171-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | AutoMoc: Don't initialize already defined CMAKE_AUTOMOC_ variablesJoerg Bornemann2022-11-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'compiler-predefines-only-cxx'Brad King2022-11-179-43/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d538cb0e18 Only initialize CMAKE_CXX_COMPILER_PREDEFINES_COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7923
| * | | | Only initialize CMAKE_CXX_COMPILER_PREDEFINES_COMMANDJoerg Bornemann2022-11-169-43/+59
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'release-3.25'Brad King2022-11-170-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'release-3.24' into release-3.25Brad King2022-11-170-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.24'Brad King2022-11-170-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'test-FindBoost-python-versions' into release-3.24Brad King2022-11-171-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !7929
* | \ \ \ \ \ Merge branch 'release-3.25'Brad King2022-11-170-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'test-FindBoost-python-versions' into release-3.25Brad King2022-11-171-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b1f933cb8 Tests: Update FindBoost.TestPython for Python 3.11 and 3.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7929
* | | | | | | Merge topic 'test-FindBoost-python-versions'Brad King2022-11-171-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b1f933cb8 Tests: Update FindBoost.TestPython for Python 3.11 and 3.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7929
| * | | | | | Tests: Update FindBoost.TestPython for Python 3.11 and 3.12Brad King2022-11-161-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | CMake Nightly Date StampKitware Robot2022-11-171-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.25'Brad King2022-11-160-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | CMake 3.25.0v3.25.0Brad King2022-11-161-1/+1
| | | | |
* | | | | Merge topic 'test-genex-TARGET_PROPERTY'Brad King2022-11-1659-29/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tests: Move some cases to RunCMake.GenEx-TARGET_PROPERTYBrad King2022-11-1514-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Move some `TARGET_PROPERTY` cases from `RunCMake.GeneratorExpression`.
| * | | | | Tests: Prepare RunCMake.GenEx-TARGET_PROPERTY for more independent casesBrad King2022-11-1510-13/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Tests: Rename RunCMake.TargetPropertyGeneratorExpressions for consistencyBrad King2022-11-1545-4/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Rename the test to `RunCMake.GenEx-TARGET_PROPERTY` for consistency with the other `RunCMake.GenEx-*` test names.
* | | | | Merge topic 'file-copy-error-path'Brad King2022-11-1610-42/+119
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | file(COPY_FILE): Report if failure occurred on input or output pathBrad King2022-11-158-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we know whether a failure was associated with the input or the output path, include this information in the error message.
| * | | | | Merge branch 'upstream-KWSys' into file-copy-error-pathBrad King2022-11-152-38/+66
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-11-15 (6c92b9b0)
| | * | | | | KWSys 2022-11-15 (6c92b9b0)KWSys Upstream2022-11-152-38/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'FindPython-enhance-SOABI'Brad King2022-11-163-19/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 328d847f70 FindPython: enhance SOABI computation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7917
| * | | | | | | FindPython: enhance SOABI computationMarc Chevrier2022-11-153-19/+40
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #24121, #23651
* | | | | | | Merge branch 'release-3.25'Brad King2022-11-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'qtifw-4.5' into release-3.25Brad King2022-11-161-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 351239b776 CPack/IFW: Add support for QtIFW 4.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7920
* | \ \ \ \ \ \ Merge topic 'qtifw-4.5'Brad King2022-11-161-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 351239b776 CPack/IFW: Add support for QtIFW 4.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7920
| * | | | | | | CPack/IFW: Add support for QtIFW 4.5Erlend E. Aasland2022-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24164
* | | | | | | | Merge branch 'release-3.25'Brad King2022-11-160-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cmp0141-pch-reuse' into release-3.25Brad King2022-11-163-2/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94164ea55e CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7914
* | | | | | | | Merge topic 'cmp0141-pch-reuse'Brad King2022-11-163-2/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 94164ea55e CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7914
| * | | | | | CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is emptyBrad King2022-11-153-2/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the policy's NEW behavior, `[CMAKE_]MSVC_DEBUG_INFORMATION_FORMAT` may be explicitly set to an empty string to tell CMake not to add any flags for this abstraction. In this case, fall back to checking the language-wide flags as we do in the OLD behavior. This revises commit 183b9a9eca (CMP0141: Fix PCH REUSE_FROM under policy NEW behavior, 2022-10-31, v3.25.0-rc3~4^2). Issue: #24106
* | | | | | CMake Nightly Date StampKitware Robot2022-11-161-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'ci-continuous'Brad King2022-11-151-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 6cf026ab06 ci: add macos-x86_64-ninja build and test jobs to continuous pipeline Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7915
| * | | | ci: add macos-x86_64-ninja build and test jobs to continuous pipelineBrad King2022-11-151-0/+3
|/ / / /
* | | | Merge topic 'ci-openmp-macos'Brad King2022-11-1510-1/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ef3638454 ci: Enable FindOpenMP tests on macOS Ninja and Makefiles jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7912
| * | | | ci: Enable FindOpenMP tests on macOS Ninja and Makefiles jobsBrad King2022-11-1410-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Since Apple does not distribute the OpenMP header and library with its AppleClang compiler, download them as part of the jobs.
* | | | | Merge topic 'cmake-E-copy-t-mode'Brad King2022-11-157-12/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d9069e5b6 cmake -E copy: Add support for -t argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7913
| * | | | | cmake -E copy: Add support for -t argumentKyle Edwards2022-11-157-12/+82
| |/ / / / | | | | | | | | | | | | | | | Fixes: #23543
* | | | | Merge topic 'clang-tidy-module-ostringstream-check'Brad King2022-11-158-0/+96
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | clang-tidy: disable ostringstream checkKyle Edwards2022-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | CMake is not remotely ready for this yet...
| * | | | | clang-tidy module: add test for ostringstream checkSean Orner2022-11-143-0/+17
| | | | | |
| * | | | | clang-tidy module: add check for ostringstreamJoe Blaauboer2022-11-144-0/+78
| |/ / / /
* | | | | Merge topic 'test-isolate-ctest-env'Brad King2022-11-159-16/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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