mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
55,657 Commits 2 Branches 401 Tags
47168b22319a1610726c00c3c8a414a330e79a8a
Commit Graph

55657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott 47168b2231 Help: Clarify CMP0126 OLD behavior for FORCE and INTERNAL 
Fixes: #23022
 2021-12-20 21:24:50 +11:00
Kitware Robot 6b5c836252 CMake Nightly Date Stamp 2021-12-20 00:02:10 -05:00
Kitware Robot 23f5588a7b CMake Nightly Date Stamp 2021-12-19 00:02:40 -05:00
Kitware Robot 1fdff77fa5 CMake Nightly Date Stamp 2021-12-18 00:02:00 -05:00
Brad King 3930c354f8 Merge topic 'vs-csproj-scripts' 
aca153b104 VS: Add custom VCEnd labels only in C# projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6808
 2021-12-17 08:58:30 -05:00
Brad King 594f81966d Merge topic 'filter-debug-find' 
d7b18895bc cmake: Add filtered debug-find options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6778
 2021-12-17 08:56:37 -05:00
John Parent d7b18895bc cmake: Add filtered debug-find options 
Add a `--debug-find-pkg=` option to debug find calls for specific
packages.

Add a `--debug-find-var=` option to debug find calls for specific
return variables.

Fixes: #21880
 2021-12-17 08:55:21 -05:00
Brad King 6c946fba65 Merge branch 'release-3.22' 2021-12-17 08:54:54 -05:00
Brad King be948f7150 Merge topic 'FindBoost-python-3.10' 
d4bb6c0c7f FindBoost: Add support for Python 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6809
 2021-12-17 08:54:53 -05:00
Brad King 92ecf5c989 Merge topic 'FindBoost-python-3.10' into release-3.22 
d4bb6c0c7f FindBoost: Add support for Python 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6809
 2021-12-17 08:54:52 -05:00
Brad King b06d31b6e0 Merge branch 'release-3.22' 2021-12-17 08:53:16 -05:00
Brad King 896abbb7c1 Merge branch 'release-3.21' into release-3.22 2021-12-17 08:53:09 -05:00
Brad King 5c69afab5a Merge branch 'release-3.21' 2021-12-17 08:52:46 -05:00
Brad King cfe0f80fbf Merge branch 'release-3.22' 2021-12-17 08:52:03 -05:00
Brad King 5cd7a6ac1e Merge topic 'vs-intel-oneapi-toolset' into release-3.22 
612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6806
 2021-12-17 08:52:02 -05:00
Brad King 5dfcb318a0 Merge topic 'vs-intel-oneapi-toolset' 
612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6806
 2021-12-17 08:52:02 -05:00
Kitware Robot 393dbe7ea1 CMake Nightly Date Stamp 2021-12-17 00:01:09 -05:00
Sumit Bhardwaj aca153b104 VS: Add custom VCEnd labels only in C# projects 
In commit dff98aa9ca (VS: add missing label in C# project-build events,
2021-12-15) the condition for adding our own `VCEnd` label was based on
the project being managed or not.  Since we support managed C++
projects, switch the condition to be based on whether the project is C#.

Issue: #21440
 2021-12-16 15:31:14 -05:00
Oleg Sidorkin d4bb6c0c7f FindBoost: Add support for Python 3.10 
Regexps in FindBoost assumed that python's minor version had only one
digit.  That became not true for 3.10.

Fixes: #23025
 2021-12-16 15:15:12 -05:00
Brad King b86c6977b1 Merge branch 'release-3.22' 2021-12-16 11:08:41 -05:00
Brad King 4d471f6630 Merge topic 'ci-windows-no-java' 
840fa28d3d ci: Explicitly disable Java tests on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6807
 2021-12-16 11:08:41 -05:00
Brad King a1da2c38dd Merge topic 'ci-windows-no-java' into release-3.22 
840fa28d3d ci: Explicitly disable Java tests on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6807
 2021-12-16 11:08:40 -05:00
Brad King 840fa28d3d ci: Explicitly disable Java tests on Windows 
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.
 2021-12-16 11:03:30 -05:00
Brad King 17c74ec4d7 Merge topic 'FetchContent-doc-typo' 
ed9ac756e8 FetchContent: Fix typo in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6803
 2021-12-16 10:40:12 -05:00
Brad King d5026daa9e Merge topic 'link-interface-backtrace' 
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
 2021-12-16 10:38:56 -05:00
Brad King d71425f989 Merge topic 'vs-csproj-scripts' 
dff98aa9ca VS: add missing label in C# project-build events

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6801
 2021-12-16 10:36:56 -05:00
Brad King 4663c82f9e Merge topic 'msvc_cuda_propagate_defines_to_ptx' 
574b492b47 CUDA: Visual Studio Generator propagates definitions for PTX files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6802
 2021-12-16 10:27:21 -05:00
Brad King b24da17d9b Merge branch 'release-3.22' 2021-12-16 10:25:55 -05:00
Brad King 3071e27c76 Merge topic 'FindBoost-1.78' 
d176ff71c0 FindBoost: Add support for Boost 1.78

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6804
 2021-12-16 10:25:54 -05:00
Brad King cee2d5b1e2 Merge topic 'FindBoost-1.78' into release-3.22 
d176ff71c0 FindBoost: Add support for Boost 1.78

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6804
 2021-12-16 10:25:53 -05:00
Kitware Robot 2c79dc95a2 CMake Nightly Date Stamp 2021-12-16 00:02:06 -05:00
Brad King b8e0b40734 Merge branch 'vs-intel-oneapi-toolset' into release-3.21 
Merge-request: !6806
 2021-12-15 15:58:43 -05:00
William R. Dieter 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 
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>
 2021-12-15 15:56:20 -05:00
Steven Boswell dff98aa9ca VS: add missing label in C# project-build events 2021-12-15 11:11:48 -07:00
Brad King 1d709ea2f5 cmGeneratorTarget: Propagate backtraces from INTERFACE_LINK_LIBRARIES 2021-12-15 12:29:47 -05:00
Brad King a84a62e0a7 cmTarget: Record backtraces for INTERFACE_LINK_LIBRARIES 2021-12-15 12:29:44 -05:00
Brad King d176ff71c0 FindBoost: Add support for Boost 1.78 
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
 2021-12-15 10:22:53 -05:00
Jukka Aho ed9ac756e8 FetchContent: Fix typo in documentation 2021-12-15 16:45:27 +02:00
Brad King 029c8f5065 Merge topic 'custom-command-main-dependency' 
780341f360 cmCustomCommand: Track main dependency explicitly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6800
 2021-12-15 08:52:52 -05:00
Kitware Robot 7de214699f CMake Nightly Date Stamp 2021-12-15 00:01:12 -05:00
unknown 574b492b47 CUDA: Visual Studio Generator propagates definitions for PTX files 
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
 2021-12-14 14:55:48 -05:00
NAKAMURA Takumi 780341f360 cmCustomCommand: Track main dependency explicitly 
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.
 2021-12-14 10:48:43 -05:00
Brad King 3ad6d09875 Merge branch 'release-3.22' 2021-12-14 09:40:18 -05:00
Brad King 7f6cce63fc Merge topic 'android-system-stl' 
38b00f8801 Android: Fix linking android_support for pre-21 system STL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6799
 2021-12-14 09:40:17 -05:00
Brad King 29442a4638 Merge topic 'android-system-stl' into release-3.22 
38b00f8801 Android: Fix linking android_support for pre-21 system STL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6799
 2021-12-14 09:40:16 -05:00
Brad King 25a300b76e Merge topic 'fix-list-transform-invalid-index-crashes' 
7dd3e99270 cmListCommand: Handle invalid FOR selector ranges

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6786
 2021-12-14 09:36:08 -05:00
Kitware Robot 7a408511bd CMake Nightly Date Stamp 2021-12-14 00:02:09 -05:00
Brad King cd6b084407 Merge topic 'FindBLAS-openmp-quiet' 
8595851d58 FindBLAS: Find OpenMP dependency quietly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6798
 2021-12-13 12:39:03 -05:00
Ryan Prichard 38b00f8801 Android: Fix linking android_support for pre-21 system STL 
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
 2021-12-13 10:43:14 -05:00
Kitware Robot 61ec751d8a CMake Nightly Date Stamp 2021-12-13 00:02:18 -05:00