mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 17:19:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,747 Commits 2 Branches 401 Tags
c00a6d3967be94a1cd8dfa369d834feea3e91725
Commit Graph

50747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Kitware Robot 8b8f0197eb CMake Nightly Date Stamp 2020-11-13 00:01:08 -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
Brad King 8be538b092 Merge topic 'ctest-batch' 
aa754e2913 CTest: Remove additional batch test variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5494
 2020-11-12 09:14:39 -05:00
Brad King 7ac092bd39 Merge topic 'suppress-link-messages' 
8e2eba6b4c MSVC: Suppress rc/mt/link output unless verbose is requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5492
 2020-11-12 09:13:50 -05:00
Brad King 08b0668043 Merge topic 'FindBLAS/OpenBLAS-OpenMP' 
f7f3d8987a FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5487
 2020-11-12 09:12:56 -05:00
Brad King a97987bda9 Merge branch 'release-3.19' 2020-11-12 09:10:54 -05:00
Brad King d579c4152f Merge topic 'FindPython-version-range-fix-tests' into release-3.19 
a00603af0b FindPython: Fix version range tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5497
 2020-11-12 09:10:53 -05:00
Brad King ccd87d89d8 Merge topic 'FindPython-version-range-fix-tests' 
a00603af0b FindPython: Fix version range tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5497
 2020-11-12 09:10:53 -05:00
Brad King d8aaa06b54 Merge topic 'FindRuby-vs-runtimes' into release-3.19 
d4a16427e2 FindRuby: Consider more VS runtime suffix combinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5486
 2020-11-12 09:09:52 -05:00
Brad King 04881b20fa Merge branch 'release-3.19' 2020-11-12 09:09:52 -05:00
Brad King 10c46689ec Merge topic 'FindRuby-vs-runtimes' 
d4a16427e2 FindRuby: Consider more VS runtime suffix combinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5486
 2020-11-12 09:09:52 -05:00
Kitware Robot 8705f9116e CMake Nightly Date Stamp 2020-11-12 00:01:09 -05:00
Nikita Nemkin c43e845d09 Help: Add .. versionadded directives to generator docs 
More `.. versionadded` could be added later when the features,
variables and properties relevant to each generator are properly
documented.

Issue: #19715
 2020-11-12 09:45:10 +05:00
Nikita Nemkin f6fd769ae9 Help: Add .. versionadded directives to CPack generator docs 
Issue: #19715
 2020-11-12 09:44:02 +05:00
Nikita Nemkin a19058d7d8 Help: Replace some versionadded directives with versionchanged 
`.. versionchanged` directive might be more appropriate when
documentation refers to previous CMake version, old behavior
or a policy, and there's no new parameter or a variable involved.

Issue: #19715
 2020-11-12 09:44:01 +05:00
Haibo Huang 3a2bb717ee Android: load ABI information from abis.cmake 
They are added to NDK and planned to release in r23:
https://android-review.googlesource.com/c/platform/ndk/+/1493421
 2020-11-11 17:11:45 -08:00
Brad King e23f9d8a02 Merge topic 'envvar_versions' into release-3.19 
5934a6275c Help: Fix `.. versionadded` directives in environment variable docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5498
 2020-11-11 15:22:26 -05:00
Brad King 8b9497e3e5 Merge branch 'release-3.19' 2020-11-11 15:22:26 -05:00
Brad King 9450ab0d23 Merge topic 'envvar_versions' 
5934a6275c Help: Fix `.. versionadded` directives in environment variable docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5498
 2020-11-11 15:22:26 -05:00
Nikita Nemkin 5934a6275c Help: Fix .. versionadded directives in environment variable docs 
Many environment variables were documented late and got
assigned wrong versions by the script.
(The whole Help/envvar section was only added in 3.10).

Issue: #19715
 2020-11-11 20:38:18 +05:00
Marc Chevrier a00603af0b FindPython: Fix version range tests 
Tests must be successful when multiple versions are installed.
 2020-11-11 16:16:49 +01:00
Brad King fd8eef0341 Merge topic 'FortranCInterface-CMP0056' 
15e77fbd40 FortranCInterface: Honor CMAKE_EXE_LINKER_FLAGS under CMP0056

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5483
 2020-11-11 09:41:10 -05:00
Brad King f1c613edcf Merge branch 'release-3.19' 2020-11-11 09:34:17 -05:00