summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBoost-python-3.10'Brad King2021-12-171-6/+6
|\ | | | | | | | | | | | | d4bb6c0c7f FindBoost: Add support for Python 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6809
| * FindBoost: Add support for Python 3.10Oleg Sidorkin2021-12-161-6/+6
| | | | | | | | | | | | | | Regexps in FindBoost assumed that python's minor version had only one digit. That became not true for 3.10. Fixes: #23025
* | Merge branch 'release-3.22'Brad King2021-12-170-0/+0
|\ \
| * \ Merge branch 'release-3.21' into release-3.22Brad King2021-12-170-0/+0
| |\ \
* | \ \ Merge branch 'release-3.21'Brad King2021-12-170-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'vs-intel-oneapi-toolset' into release-3.21Brad King2021-12-151-5/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6806
* | \ \ \ Merge branch 'release-3.22'Brad King2021-12-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'vs-intel-oneapi-toolset' into release-3.22Brad King2021-12-171-5/+3
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806
* | | | Merge topic 'vs-intel-oneapi-toolset'Brad King2021-12-171-5/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806
| * | | VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021William R. Dieter2021-12-151-5/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit 7808cbd644 (CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen, 2020-12-06, v3.20.0-rc1~330^2) matches a specific toolset known to be the `icx.exe` compiler, and assumes all other Intel C++ compilers (that are not DPC++) must be `icl.exe`. Since `icx.exe` is officially replacing `icl.exe`, use a regex that matches the now-fixed set of toolsets known to use `icl.exe`. Any other Intel C++ compiler will be assumed to be `icx.exe`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | CMake Nightly Date StampKitware Robot2021-12-171-1/+1
| | |
* | | Merge branch 'release-3.22'Brad King2021-12-160-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'ci-windows-no-java' into release-3.22Brad King2021-12-162-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 840fa28d3d ci: Explicitly disable Java tests on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6807
* | \ \ Merge topic 'ci-windows-no-java'Brad King2021-12-162-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 840fa28d3d ci: Explicitly disable Java tests on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6807
| * | | ci: Explicitly disable Java tests on WindowsBrad King2021-12-162-1/+2
| |/ / | | | | | | | | | | | | | | | | | | Avoid searching for a Java installation on Windows hosts. This will allow some CI hosts to have Java for other projects. We already do this on macOS. While at it, clarify the macOS setting.
* | | Merge topic 'FetchContent-doc-typo'Brad King2021-12-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ed9ac756e8 FetchContent: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6803
| * | | FetchContent: Fix typo in documentationJukka Aho2021-12-151-1/+1
| | | |
* | | | Merge topic 'link-interface-backtrace'Brad King2021-12-168-52/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d709ea2f5 cmGeneratorTarget: Propagate backtraces from INTERFACE_LINK_LIBRARIES a84a62e0a7 cmTarget: Record backtraces for INTERFACE_LINK_LIBRARIES Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6805
| * | | | cmGeneratorTarget: Propagate backtraces from INTERFACE_LINK_LIBRARIESBrad King2021-12-155-50/+78
| | | | |
| * | | | cmTarget: Record backtraces for INTERFACE_LINK_LIBRARIESBrad King2021-12-153-2/+38
| |/ / /
* | | | Merge topic 'vs-csproj-scripts'Brad King2021-12-164-1/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dff98aa9ca VS: add missing label in C# project-build events Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6801
| * | | | VS: add missing label in C# project-build eventsSteven Boswell2021-12-154-1/+46
| | | | |
* | | | | Merge topic 'msvc_cuda_propagate_defines_to_ptx'Brad King2021-12-164-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 574b492b47 CUDA: Visual Studio Generator propagates definitions for PTX files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6802
| * | | | | CUDA: Visual Studio Generator propagates definitions for PTX filesunknown2021-12-144-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From CUDA 9.0 to CUDA 11.4 the CUDA Visual Studio integration defines omitted user defines from PTX generation. With CUDA 11.5 this has been resolved, so we backport the fix to allow for consistent behavior when using CMake
* | | | | | Merge branch 'release-3.22'Brad King2021-12-160-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'FindBoost-1.78' into release-3.22Brad King2021-12-161-2/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d176ff71c0 FindBoost: Add support for Boost 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6804
* | \ \ \ \ \ Merge topic 'FindBoost-1.78'Brad King2021-12-161-2/+17
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d176ff71c0 FindBoost: Add support for Boost 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6804
| * | | | | | FindBoost: Add support for Boost 1.78Brad King2021-12-151-2/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_78_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.78.0 source tree. The dependencies differ from those of 1.77: * The `log` component no longer depends on `date_time`. Fixes: #23016
* | | | | | CMake Nightly Date StampKitware Robot2021-12-161-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'custom-command-main-dependency'Brad King2021-12-1514-60/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 780341f360 cmCustomCommand: Track main dependency explicitly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6800
| * | | | | cmCustomCommand: Track main dependency explicitlyNAKAMURA Takumi2021-12-1414-60/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the main dependency as the first entry in the dependency list plus a boolean member indicating its existence. Note that this slightly changes existing behavior: the main dependency was previously the last entry of the dependency list.
* | | | | | CMake Nightly Date StampKitware Robot2021-12-151-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.22'Brad King2021-12-140-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'android-system-stl' into release-3.22Brad King2021-12-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38b00f8801 Android: Fix linking android_support for pre-21 system STL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6799
* | \ \ \ \ \ Merge topic 'android-system-stl'Brad King2021-12-141-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38b00f8801 Android: Fix linking android_support for pre-21 system STL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6799
| * | | | | | Android: Fix linking android_support for pre-21 system STLRyan Prichard2021-12-131-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This typo was introduced in commit 4dca078829 (Android: Link c++abi and android_support when necessary, 2020-10-29, v3.20.0-rc1~541^2). Fixes: #23004
* | | | | | Merge topic 'fix-list-transform-invalid-index-crashes'Brad King2021-12-1411-2/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7dd3e99270 cmListCommand: Handle invalid FOR selector ranges Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6786
| * | | | | | cmListCommand: Handle invalid FOR selector rangesNick Muggio2021-12-0911-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes crashes involving invalid ranges specified in list(TRANSFORM ... FOR ...) calls. * Report error when step is not positive * Report error when start is after stop Fixes: #22985
* | | | | | | CMake Nightly Date StampKitware Robot2021-12-141-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'FindBLAS-openmp-quiet'Brad King2021-12-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8595851d58 FindBLAS: Find OpenMP dependency quietly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6798
| * | | | | | FindBLAS: Find OpenMP dependency quietlyBrad King2021-12-101-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `find_package(OpenMP)` calls added/updated by: * commit f7f3d8987a (FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC, 2020-11-10, v3.20.0-rc1~492^2) * commit 9ef82d95d8 (FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC, 2021-04-07, v3.20.1~3^2) were missing the `QUIET` option. Fixes: #23000
* | | | | | CMake Nightly Date StampKitware Robot2021-12-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-12-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-12-111-1/+1
|/ / / / /
* | | | | Merge topic 'msbuild-target-inputs-object-depends'Brad King2021-12-101-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abc6377469 VS: Add OBJECT_DEPENDS as AdditionalDependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6775
| * | | | | VS: Add OBJECT_DEPENDS as AdditionalDependenciesDietmar Scheidl2021-12-091-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22733
* | | | | | Merge topic 'link-iface-usage-reqs-only'Brad King2021-12-104-53/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e49880472 cmGeneratorTarget: Avoid boolean trap in usage requirement lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6796
| * | | | | | cmGeneratorTarget: Avoid boolean trap in usage requirement lookupBrad King2021-12-094-53/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `bool usage_requirements_only` arguments with a proper enumeration to clarify meaning at call sites.
* | | | | | | Merge topic 'ci-nmake-jom'Brad King2021-12-101-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f5c872ed1 ci: Exclude spuriously failing test from JOM nightly CI job Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6797
| * | | | | | | ci: Exclude spuriously failing test from JOM nightly CI jobBrad King2021-12-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 3b9975d9b5 (ci: Add JOM nightly CI job, 2021-11-17) the `ExternalProject` test often fails spuriously with an internal error message from JOM. Exclude it for now pending further investigation. Prior to covering JOM in CI, it was covered by a standalone nightly build that excluded the `ExternalProject` test for the same reason.