mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,817 Commits 2 Branches 401 Tags
9a68b493584471d1f3e4ff68a7e7dccccae5ca50
Commit Graph

51817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 9a68b49358 Merge topic 'doc-3.20-relnotes' 
a30d096c85 Help: Update Sphinx versionadded directives for 3.20 release
704878e3ad Help: Organize and revise 3.20 release notes
4911636728 Help: Consolidate 3.20 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5790
 2021-02-10 08:22:13 -05:00
Brad King a30d096c85 Help: Update Sphinx versionadded directives for 3.20 release 
Run the script:

    Utilities/Sphinx/update_versions.py --since v3.19.0 --overwrite

Manually restore the 3.20 version for `cmake_path`, which was originally
part of 3.19 but reverted and restored in 3.20.
 2021-02-10 08:18:12 -05:00
Brad King 704878e3ad Help: Organize and revise 3.20 release notes 
Add section headers similar to the 3.19 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2021-02-10 08:17:45 -05:00
Brad King 4911636728 Help: Consolidate 3.20 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.20.rst`.
 2021-02-10 08:16:42 -05:00
Brad King ea07176b9a Merge topic 'FindBoost-no-warn' 
90467747a1 FindBoost: Add option to suppress new boost version dependency warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5794
 2021-02-10 08:14:40 -05:00
John Melas 90467747a1 FindBoost: Add option to suppress new boost version dependency warning 
Add option `Boost_NO_WARN_NEW_VERSIONS` to suppress new boost version
dependency warning.

Fixes: #21786
 2021-02-10 08:02:24 -05:00
Brad King bb68658e98 Merge topic 'findcudatoolkit_handle_cuda_compiler_without_enabled_lang' 
cd89d1c328 FindCUDAToolkit: Robust version checks when CUDA lang is not enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5787
 2021-02-10 07:48:50 -05:00
Brad King 17c4ee406a Merge branch 'release-3.19' 2021-02-10 07:46:33 -05:00
Brad King 691e8ac480 Merge topic 'clang-imsvc' 
2fc5e5dba9 Clang: Use -imsvc for system include only with MSVC-like front-end

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !5792
 2021-02-10 07:46:33 -05:00
Brad King 7228faa109 Merge topic 'clang-imsvc' into release-3.19 
2fc5e5dba9 Clang: Use -imsvc for system include only with MSVC-like front-end

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !5792
 2021-02-10 07:46:33 -05:00
Brad King 1356b94a87 Merge branch 'release-3.19' 2021-02-10 07:45:30 -05:00
Brad King ff55f33c68 Merge topic 'ctest-dashboard-with-modified-files' 
33fa015b4a CTest: Restore running dashboard client Test step with modified files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5791
 2021-02-10 07:45:30 -05:00
Brad King 98597aec1a Merge topic 'ctest-dashboard-with-modified-files' into release-3.19 
33fa015b4a CTest: Restore running dashboard client Test step with modified files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5791
 2021-02-10 07:45:29 -05:00
Kitware Robot 090dbb0386 CMake Nightly Date Stamp 2021-02-10 00:01:16 -05:00
Brad King 2fc5e5dba9 Clang: Use -imsvc for system include only with MSVC-like front-end 
In commit bb61c2d024 (Clang: use -imsvc for system include dirs when
running on Windows, 2020-09-16, v3.19.0-rc1~162^2) we added `-imsvc`
for all Clang compilers targeting the MSVC ABI.  However, the option
only exists for the MSVC-like front-end.  The GNU-like front-ends
use `-isystem`.

Fixes: #21789
 2021-02-09 11:24:41 -05:00
Brad King 33fa015b4a CTest: Restore running dashboard client Test step with modified files 
Since commit 6a6f1d1edd (CTest: exit nonzero after
message(SEND_ERROR|FATAL_ERROR), 2020-04-03, v3.19.0-rc1~260^2), `ctest`
no longer runs tests if there are errors before the full set of tests is
defined.  Such errors were previously treated more like warnings.

The change exposed some cases where we were issuing an error message but
proceeding to run tests anyway.  The above commit downgraded one such
case (missing `DartConfiguration.tcl`) to a warning explicitly in order
to restore its former warning-like semantics.

Downgrade the Update step's diagnostic about modified or conflicting
files to a warning for the same reason.

Fixes: #21783
 2021-02-09 11:05:08 -05:00
Robert Maynard cd89d1c328 FindCUDAToolkit: Robust version checks when CUDA lang is not enabled 
Previously if you set `CMAKE_CUDA_COMPILER` but hadn't enabled
the CUDA language, FindCUDAToolkit would not correctly compute
the version information.
 2021-02-09 09:39:20 -05:00
Brad King 22902cb38c Merge branch 'release-3.19' 2021-02-09 08:25:27 -05:00
Brad King 340ca27f8d Merge topic 'FindXCTest-bundle-inject' into release-3.19 
eafe740ead FindXCTest: Fix output directory for test bundle with new build system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5786
 2021-02-09 08:25:27 -05:00
Brad King c4c902d132 Merge topic 'FindXCTest-bundle-inject' 
eafe740ead FindXCTest: Fix output directory for test bundle with new build system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5786
 2021-02-09 08:25:27 -05:00
Brad King 89f7cbcb31 Merge branch 'release-3.19' 2021-02-09 08:23:30 -05:00
Brad King cab99f7dba Merge topic 'xcode12-ios_install_combined' 
0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5785
 2021-02-09 08:23:30 -05:00
Brad King 263fd22fd8 Merge topic 'xcode12-ios_install_combined' into release-3.19 
0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5785
 2021-02-09 08:23:29 -05:00
Brad King 40f4147224 Merge topic 'object-lib-multiarch' 
4d46b1401f add_library(): Allow imported object libraries with multi-arch
1a915e8953 Tests: TargetObjects does not need any languages enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5771
 2021-02-09 08:22:06 -05:00
Brad King 9b9075f723 Merge topic 'cuda_support_nvcc_from_hpctoolkit' 
3cef91a321 CUDA: Always extract CUDA Toolkit root from nvcc verbose output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5777
 2021-02-09 08:21:17 -05:00
Brad King 18fa819e26 Merge topic '21479-branding-name-cpack-nsis' 
0aabeb0c30 CPack/NSIS: Add option for setting branding text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5784
 2021-02-09 08:20:17 -05:00
Brad King 54f15cbb99 Merge topic 'AddFileDependencies-deprecate' 
9cddaad940 AddFileDependencies: Deprecate this unnecessary module
4841d38a7a MacroAddFileDependencies: Explicitly deprecate by documentation
777c14af82 MacroAddFileDependencies: Simplify implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5788
 2021-02-09 08:19:28 -05:00
Kitware Robot f7dd651ca7 CMake Nightly Date Stamp 2021-02-09 00:01:14 -05:00
Yauheni Khnykin eafe740ead FindXCTest: Fix output directory for test bundle with new build system 
The output directory was still correct for macOS with the new build system,
but not for iOS.

Fixes: #20662
 2021-02-09 10:20:57 +11:00
Brad King f8fa6804e5 Merge topic 'copyright-sort' 
046175b35a Copyright.txt: Sort list of Contributors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5789
 2021-02-08 18:00:24 -05:00
Brad King 046175b35a Copyright.txt: Sort list of Contributors 2021-02-08 17:55:28 -05:00
Robert Maynard 3cef91a321 CUDA: Always extract CUDA Toolkit root from nvcc verbose output 
Fixes #21750, #21763

Given that NVCC can be provided by multiple different sources (NVIDIA HPC SDK, CUDA Toolkit, distro)
each of which has a different layout, we need to extract the CUDA toolkit root from the compiler
itself, allowing us to support numerious different scattered toolkit layouts.

The NVIDIA HPC SDK specifically ships two copies of nvcc one in
`compilers/bin/` and one in `cuda/bin`. Thus when using
`compilers/bin/nvcc` the Toolkit root logic fails.
 2021-02-08 12:13:01 -08:00
Brad King 9cddaad940 AddFileDependencies: Deprecate this unnecessary module 
Document that one can call `set_property` directly instead.
 2021-02-08 12:44:37 -05:00
Brad King 4841d38a7a MacroAddFileDependencies: Explicitly deprecate by documentation 
This module has been discouraged since commit 1e20be319f (STYLE: add
documentation for MACRO_ADD_FILE_DEPENDENCIES(), 2009-07-14,
v2.8.0~433).  It has been listed in the `cmake-modules(7)` manual
as deprecated since commit df780bcc01 (Help: Move deprecated modules to
appropriate section., 2018-11-12, v3.14.0-rc1~374^2).  Add the explicit
deprecation mark in its documentation.
 2021-02-08 12:34:15 -05:00
Brad King 777c14af82 MacroAddFileDependencies: Simplify implementation 2021-02-08 12:34:15 -05:00
Brad King 17d4138108 Merge topic 'AddFileDependencies-simplify' 
0f6fc388ea AddFileDependencies: Avoid leaking temporary variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5779
 2021-02-08 12:22:23 -05:00
Anakin Skywalker 0f6fc388ea AddFileDependencies: Avoid leaking temporary variable 
Convert `add_file_dependencies` to a function.
Simplify the implementation using `set_property` with `APPEND`.
 2021-02-08 12:21:43 -05:00
Brad King 326cceaafc Merge topic 'cmake_library_architecture_better_multiarch_support' 
657fc3a9a7 CMakeDetermineCompilerABI: Parse library arch from versioned paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5773
 2021-02-08 12:05:07 -05:00
Brad King 4b406ead2a Merge topic 'FindGit-version-optimization-more' 
c99dfd7be7 FindGit: Cache the version more effectively

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5774
 2021-02-08 12:04:17 -05:00
Brad King 24e465a550 Merge topic 'doc-genex-links' 
5dd356cefc Help: Convert some genex names to explicit cross-references

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5778
 2021-02-08 12:00:22 -05:00
Brad King 7b10c6e299 Merge topic 'parser-gcc-warning' 
aac80ec1ee LexerParser: Suppress gcc -Wfree-nonheap-object warnings in generated code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christoph Grüninger <foss@grueninger.de>
Merge-request: !5775
 2021-02-08 11:58:28 -05:00
Brad King 76e0f6cf33 Merge branch 'release-3.18' 2021-02-08 11:45:00 -05:00
Brad King 2c12331484 Merge branch 'release-3.19' 2021-02-08 11:44:16 -05:00
Brad King f61321bedf Merge topic 'lexer-posix-source' 
a8b41e2c68 LexerParser: Do not override existing _POSIX_C_SOURCE definition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5776
 2021-02-08 11:44:16 -05:00
Brad King 58167b3eb0 Merge topic 'lexer-posix-source' into release-3.19 
a8b41e2c68 LexerParser: Do not override existing _POSIX_C_SOURCE definition
82cfeeb484 Merge branch 'backport-3.18-ci-wix-download' into release-3.18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5776
 2021-02-08 11:44:15 -05:00
Craig Scott 0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only) 
Xcode 12 doesn't allow nested builds within the same build directory.
That means we can no longer do an install by building the install target
when IOS_INSTALL_COMBINED is true. We can, however, still do an install
by running the cmake_install.cmake script or executing cmake --install,
since there is no outer build and therefore the associated SDK can be
built as a sub-build.

The non-build methods previously didn't work when
IOS_INSTALL_COMBINED was true because the generated install script
and the CMakeIOSInstallCombined script both made certain assumptions
that relied on being part of a build. Those assumptions are now
removed. A side-effect of this work is that cpack now also works from the
command line when IOS_INSTALL_COMBINED is true.

Relates: #21282
Fixes: #20023
 2021-02-08 18:02:46 +11:00
Kitware Robot b06a480b57 CMake Nightly Date Stamp 2021-02-08 00:04:15 -05:00
Johnny Jazeix 0aabeb0c30 CPack/NSIS: Add option for setting branding text 
See https://nsis.sourceforge.io/Reference/BrandingText
for more information.

Fixes: #21479
 2021-02-07 16:10:57 +01:00
Kitware Robot db0a734349 CMake Nightly Date Stamp 2021-02-07 00:01:07 -05:00
Kitware Robot 51f7d7e919 CMake Nightly Date Stamp 2021-02-06 00:01:19 -05:00