Commit Graph

50769 Commits

Author SHA1 Message Date
Kitware Robot
9506449445 CMake Nightly Date Stamp 2020-11-17 00:01:09 -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
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
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
Brad King
18f152e9c0 Merge topic 'xcode-compiler-id-arch' into release-3.19
98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5505
2020-11-13 09:40:09 -05:00
Brad King
f73aacc746 Merge branch 'release-3.19' 2020-11-13 09:40:09 -05:00
Brad King
5ba7559966 Merge topic 'xcode-compiler-id-arch'
98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5505
2020-11-13 09:40:09 -05:00
Ben Boeckel
6e35919e15 gitlab-ci: use Fedora 33 to build sources 2020-11-13 08:58:17 -05:00
Ben Boeckel
061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33 2020-11-13 08:58:17 -05:00
Ben Boeckel
bd62d2ecf3 ci: update to Fedora 33 for Linux builds 2020-11-13 08:37:07 -05:00
Brad King
ada3170625 ci: install gmock in the Fedora 31 image
The gmock libraries are referenced by GTest's CMake package files.

While at it, also explicitly install gettext.  It is installed already,
but make it explicit for future testing of the FindGettext module.

(cherry picked from commit 585cc7c930)
2020-11-13 08:37:03 -05:00
Kitware Robot
8b8f0197eb CMake Nightly Date Stamp 2020-11-13 00:01:08 -05:00
Ben Boeckel
86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9 2020-11-12 17:55:31 -05:00
Ben Boeckel
6a83417908 clang-tidy: ignore new warnings from newer versions
These warnings can be fixed in the future, but are ignored for now.
2020-11-12 17:55:31 -05:00
Ben Boeckel
d2b648ec4c clang-tidy: ignore misc-no-recursion
CMake has intentional recursion in its codebase, so avoid warning about
occurrences.
2020-11-12 17:55:31 -05:00
Erlend Egeberg Aasland
5ab75dd7dd CPack/IFW: Locate the archivegen utility
Fixes: #21427
2020-11-12 21:22:53 +01:00
Brad King
3e2a2d16a6 Merge branch 'xcode-compiler-id-path' into release-3.18
Merge-request: !5506
2020-11-12 12:24:00 -05:00
Brad King
bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs
When targeting a platform that supports multiple architectures, Xcode
may choose to build all of them in our small compiler id project.
Update the regex we use to extract the path to the compiler from
the Xcode output to account for this.

Fixes: #21425
2020-11-12 12:20:34 -05:00
Brad King
98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id
In commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple
Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) we forgot to update the
compiler id architecture selection added by commit 26673bf480 (Xcode:
Explicitly specify default native architecture on macOS, 2020-07-16,
v3.18.1~20^2).

Issue: #21425
2020-11-12 11:26:19 -05:00
Nikita Nemkin
cb28d9af1f UseJava: Move helper scripts to subdirectory
Also, exclude them from the help module index.
2020-11-12 20:14:05 +05:00
Erlend Egeberg Aasland
63ae96a317 CPack/IFW: Add support for QtIFW 4.0
installerbase v4.0 segfaults on macOS if you pass `--framework-version`,
so re-order flags to try `--version` first.

Fixes: #21426
2020-11-12 09:53:51 -05:00
Michael Hirsch
48645cabe3 Help: MSVC now has C standard level flags 2020-11-12 09:41:24 -05:00