Commit Graph

50787 Commits

Author SHA1 Message Date
Brad King
c8b2331e8b Merge topic 'rename_cuda_memcheck'
fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5514
2020-11-18 07:29:54 -05:00
Kitware Robot
e58bc4bc31 CMake Nightly Date Stamp 2020-11-18 00:01:28 -05:00
Brad King
b8038131a6 Merge branch 'release-3.19' 2020-11-17 16:40:43 -05:00
Brad King
d2587ef1eb Merge topic 'gitlab-ci-msvc-14.28'
a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5513
2020-11-17 16:40:43 -05:00
Brad King
ca9a182d23 Merge topic 'gitlab-ci-msvc-14.28' into release-3.19
a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5513
2020-11-17 16:40:43 -05:00
Tobias Ribizel
fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer 2020-11-17 21:06:30 +01:00
Brad King
a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28 2020-11-17 13:34:51 -05:00
Brad King
c0619861c9 Merge topic 'cmake-build-specify-makefile-name'
cfce067b3f Tests: Add RunCMake.Make case for conflicting Makefile names
378c047ae3 Makefiles: Explicitly tell 'make' tool what Makefile name to use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5509
2020-11-17 13:16:02 -05:00
Brad King
0b47e940cf Merge topic 'cpack-deb-no-dbgsyms'
c826745f5a CPack/DEB: Do not crash when asked for debug symbols when there are none

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5443
2020-11-17 13:14:54 -05:00
Brad King
0c0e7525c4 Merge topic 'pch-header-not-generated'
7524501d89 PCH: Do not mark PCH-header as generated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5510
2020-11-17 13:13:49 -05:00
Brad King
c9764c902d Merge topic 'msvc-14.28' into release-3.19
c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5512
2020-11-17 13:10:32 -05:00
Brad King
cc80cc5116 Merge branch 'release-3.19' 2020-11-17 13:10:32 -05:00
Brad King
5166915c07 Merge topic 'msvc-14.28'
c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5512
2020-11-17 13:10:32 -05:00
Brad King
c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK
Issue: #21446
2020-11-17 11:50:50 -05:00
Kitware Robot
9506449445 CMake Nightly Date Stamp 2020-11-17 00:01:09 -05:00
Craig Scott
c22f434c83 Merge topic 'xcode-clean-lib-paths' into release-3.19
b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5511
2020-11-16 14:23:52 -05:00
Craig Scott
1d83431dbb Merge branch 'release-3.19' 2020-11-16 14:23:52 -05:00
Craig Scott
67ebcfbcbb Merge topic 'xcode-clean-lib-paths'
b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5511
2020-11-16 14:23:52 -05:00
Andrew Fuller
c826745f5a CPack/DEB: Do not crash when asked for debug symbols when there are none
Fixes: #21356
2020-11-16 14:03:07 -05:00
Deniz Bahadir
7524501d89 PCH: Do not mark PCH-header as generated
The PCH header file itself is written by CMake and is not generated by
part of the buildsystem.  Therefore the `GENERATED` property is not
appropriate to set because the file is always present before the build
starts.  We already do not mark the PCH source file as `GENERATED`
either.

This is a preparation for solving #18399, which will no longer allow to
unset the `GENERATED` property from a source-file once it was set.

Fixes: #21437
Signed-off-by: Deniz Bahadir <dbahadir@benocs.com>
2020-11-16 12:56:54 -05:00
Brad King
cfce067b3f Tests: Add RunCMake.Make case for conflicting Makefile names
Issue: #21418
2020-11-16 11:34:53 -05:00
Oliver Schneider
378c047ae3 Makefiles: Explicitly tell 'make' tool what Makefile name to use
CMake did not specify the filename of the Makefile generated by it.
Due to GNU make precedence rules this means that the presence of a
GNUmakefile or makefile would take precedence over the generated
Makefile.

This is only relevant for in-source builds and only whenever an
alternative makefile by the above mentioned names exists.

This patch adds the (seemingly universal) `-f` switch and the
(hardcoded) filename (it is now hardcoded separately in these two
files):

- cmLocalUnixMakefileGenerator3.cxx
- cmGlobalUnixMakefileGenerator3.cxx

Fixes: #21418
2020-11-16 11:34:53 -05:00
Brad King
01b473b810 Merge topic 'msvc-no-GR'
c00a6d3967 MSVC: Do not add /GR to CMAKE_CXX_FLAGS by default
6114c8e994 MSVC: Factor out initialization of /GR flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5508
2020-11-16 11:19:28 -05:00
Brad King
87ef956865 Merge topic 'ci-fedora33' into release-3.19
6e35919e15 gitlab-ci: use Fedora 33 to build sources
061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33
bd62d2ecf3 ci: update to Fedora 33 for Linux builds
ada3170625 ci: install gmock in the Fedora 31 image
86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9
6a83417908 clang-tidy: ignore new warnings from newer versions
d2b648ec4c clang-tidy: ignore `misc-no-recursion`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5504
2020-11-16 11:16:12 -05:00
Brad King
e832d86490 Merge branch 'release-3.19' 2020-11-16 11:16:12 -05:00
Brad King
1efdba91ae Merge topic 'ci-fedora33'
3d1183c457 Merge branch 'ci-fedora33-release' into ci-fedora33
6e35919e15 gitlab-ci: use Fedora 33 to build sources
061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33
bd62d2ecf3 ci: update to Fedora 33 for Linux builds
ada3170625 ci: install gmock in the Fedora 31 image
86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9
6a83417908 clang-tidy: ignore new warnings from newer versions
d2b648ec4c clang-tidy: ignore `misc-no-recursion`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5504
2020-11-16 11:16:12 -05:00
Kitware Robot
3ae680841c CMake Nightly Date Stamp 2020-11-16 00:01:17 -05:00
Gusts Kaksis
b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions 2020-11-16 07:14:57 +11:00
Kitware Robot
75ced70154 CMake Nightly Date Stamp 2020-11-15 00:01:07 -05:00
Craig Scott
eb04e25ba6 Merge topic 'cmake_path-enhancements'
ed21ad181e cmake_path: various enhancements to subcommands/keywords

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5457
2020-11-14 06:39:42 -05:00
Kitware Robot
5501958d16 CMake Nightly Date Stamp 2020-11-14 00:01:08 -05:00
Brad King
c00a6d3967 MSVC: Do not add /GR to CMAKE_CXX_FLAGS by default
The `/GR` flag has been on by default since MSVC cl 14.0 from VS 2005.
Remove it from the default flags to make it easier for projects to pass
`/GR-` themselves to turn it off.

Projects may be using string processing to replace `/GR` with another
flag, so we cannot simply drop it.  Add a policy to drop it in a
compatible way.

Fixes: #21428
2020-11-13 11:46:23 -05:00
Brad King
6114c8e994 MSVC: Factor out initialization of /GR flag 2020-11-13 10:50:25 -05:00
Brad King
225fb10f67 Merge topic 'usejava_helpers'
cb28d9af1f UseJava: Move helper scripts to subdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5501
2020-11-13 09:48:56 -05:00
Brad King
d06676ebee Merge topic 'versionadded'
c43e845d09 Help: Add `.. versionadded` directives to generator docs
f6fd769ae9 Help: Add `.. versionadded` directives to CPack generator docs
a19058d7d8 Help: Replace some `versionadded` directives with `versionchanged`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5495
2020-11-13 09:47:37 -05:00
Ben Boeckel
3d1183c457 Merge branch 'ci-fedora33-release' into ci-fedora33
* ci-fedora33-release:
  gitlab-ci: use Fedora 33 to build sources
  gitlab-ci: update Linux CI to use Fedora 33
  ci: update to Fedora 33 for Linux builds
  ci: install gmock in the Fedora 31 image
  Tests/FindBoost/TestPython: support finding 3.8 and 3.9
  clang-tidy: ignore new warnings from newer versions
  clang-tidy: ignore `misc-no-recursion`
2020-11-13 09:46:40 -05:00
Brad King
1bedfa7c5d Merge topic 'android-abis'
3a2bb717ee Android: load ABI information from abis.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5499
2020-11-13 09:46:40 -05:00
Brad King
9279d1fc0b Merge branch 'release-3.19' 2020-11-13 09:45:33 -05:00
Brad King
c457670711 Merge topic 'qtifw-archivegen'
5ab75dd7dd CPack/IFW: Locate the archivegen utility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5503
2020-11-13 09:45:33 -05:00
Brad King
c35c4ae85c Merge topic 'qtifw-archivegen' into release-3.19
5ab75dd7dd CPack/IFW: Locate the archivegen utility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5503
2020-11-13 09:45:32 -05:00
Brad King
3948d9f0c2 Merge branch 'release-3.19' 2020-11-13 09:44:28 -05:00
Brad King
5dd1d841f3 Merge topic 'qtifw-4.0'
63ae96a317 CPack/IFW: Add support for QtIFW 4.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5502
2020-11-13 09:44:28 -05:00
Brad King
140e06e344 Merge topic 'qtifw-4.0' into release-3.19
63ae96a317 CPack/IFW: Add support for QtIFW 4.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5502
2020-11-13 09:44:27 -05:00
Brad King
bc4c65a609 Merge branch 'release-3.19' 2020-11-13 09:43:08 -05:00
Brad King
eb73f343f0 Merge topic 'doc-cstd'
48645cabe3 Help: MSVC now has C standard level flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5500
2020-11-13 09:43:08 -05:00
Brad King
ddd6979aab Merge topic 'doc-cstd' into release-3.19
48645cabe3 Help: MSVC now has C standard level flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5500
2020-11-13 09:43:07 -05:00
Brad King
ef8c93cd60 Merge branch 'release-3.18' into master 2020-11-13 09:42:01 -05:00
Brad King
d8b50fd185 Merge topic 'xcode-compiler-id-path' into release-3.19
bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs
a070565a66 Merge branch 'FindRuby-restore-VENDORLIB_DIR' into release-3.18
3969c86b51 Merge branch 'cuda_vs_skip_computation' into release-3.18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5506
2020-11-13 09:41:25 -05:00
Brad King
15931155bb Merge branch 'release-3.19' 2020-11-13 09:41:25 -05:00
Brad King
72f8237422 Merge topic 'xcode-compiler-id-path'
bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5506
2020-11-13 09:41:25 -05:00