Commit Graph

48746 Commits

Author SHA1 Message Date
Kyle Edwards
d5b5c19278 cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem
Prior to 147d36c, the build tool was found before the toolset was
selected, but was changed to be found after in order to support a
64-bit MSBuild (introduced in da402a0.) However, a bug was found in
64-bit MSBuild, which resulted in da402a0 being reverted in
f3cedf3 (but 147d36c was not reverted.) Move FindMakeProgram() even
earlier than it was before 147d36c, before CMakeDetermineSystem is
called, so that the Visual Studio Android support can report its
sysroot, giving Android-Determine the information it needs to
inspect the NDK.

When the bug in 64-bit MSBuild is fixed, we will have a chicken-and-
egg problem, but we don't need to worry about it for now.
2020-06-18 15:35:26 -04:00
Brad King
01fdd421bb Merge branch 'release-3.18' 2020-06-18 12:45:27 -04:00
Brad King
d1492e93cf Merge topic 'improve_device_link_policy_cross_ref'
e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4919
2020-06-18 12:45:27 -04:00
Brad King
c26853718e Merge topic 'improve_device_link_policy_cross_ref' into release-3.18
e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4919
2020-06-18 12:45:27 -04:00
Brad King
2ca6803aa0 Merge branch 'release-3.18' 2020-06-18 12:44:14 -04:00
Brad King
310e953d58 Merge topic 'doc-3.18-fixups' into release-3.18
947cfc732d Help: Explicitly say transaction, don't abbreviate to trans
90c73479bc Help: Correct and condense examples for VS_SOLUTION_DEPLOY
0420de10b5 Help: Add missing cross-referencing for generator expressions
013f7a2647 Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>
a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups
95a16f7805 Help: Fix formatting error and consistency for gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4915
2020-06-18 12:44:14 -04:00
Brad King
4b6ba7c3d8 Merge topic 'doc-3.18-fixups'
947cfc732d Help: Explicitly say transaction, don't abbreviate to trans
90c73479bc Help: Correct and condense examples for VS_SOLUTION_DEPLOY
0420de10b5 Help: Add missing cross-referencing for generator expressions
013f7a2647 Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>
a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups
95a16f7805 Help: Fix formatting error and consistency for gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4915
2020-06-18 12:44:14 -04:00
Robert Maynard
e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing 2020-06-18 12:07:26 -04:00
Brad King
0a7a4665be Merge topic 'xcode-link-libs'
58c05e1c73 Xcode: Use "Link Binary With Libraries" build phase when possible
927373b678 Xcode: Refactor generator variable names and types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4882
2020-06-18 09:51:35 -04:00
Brad King
e0b21ad924 Merge topic 'languageStandardRefactor'
742ff97f80 Refactor language standard computation
0892c798f7 cmMakefile: Change CompileFeatureKnown to take target name instead of target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4803
2020-06-18 09:47:41 -04:00
Brad King
2399be054b Merge topic 'configure_file-error-handling'
032506acc6 cmake: implement error handling in configure_file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4889
2020-06-18 09:43:13 -04:00
Brad King
349fb099eb Merge topic 'mkl-lib-dir'
8d5a07ce76 FindLAPACK: Extend search directories for MKL
d880d2805f FindBLAS: Extend search directories for MKL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4905
2020-06-18 09:42:34 -04:00
Brad King
3252bc4476 Merge topic 'tutorial_install_when_built_static'
0fdfd6bf37 Tutorial: Install correctly when built statically

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4906
2020-06-18 09:41:31 -04:00
Brad King
d7541e80ed Merge topic 'tutorial_correct_step9_wording'
7c3204fc7d Tutorial: Correct Step9 wording

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4907
2020-06-18 09:40:38 -04:00
Brad King
96602aeee2 Merge topic 'refactor_try_compile_parsing'
574f71efba try_compile: Refactor language standard level parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4900
2020-06-18 09:39:54 -04:00
Brad King
ab95b959c7 Merge branch 'release-3.18' 2020-06-18 09:37:47 -04:00
Brad King
cadc658e9d Merge topic 'armclang-typo'
2ff68c00e0 ARMClang: Fix typo in -Xlinker flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4916
2020-06-18 09:37:47 -04:00
Brad King
b8d136652f Merge topic 'armclang-typo' into release-3.18
2ff68c00e0 ARMClang: Fix typo in -Xlinker flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4916
2020-06-18 09:37:46 -04:00
Brad King
556be5cf10 Merge branch 'release-3.18' 2020-06-18 09:36:47 -04:00
Brad King
8896a127a6 Merge topic 'test-split-RunCMake.target_link_libraries' into release-3.18
5f97e44912 Tests: Shorten case names in RunCMake.target_link_libraries-* tests
0951b1fe07 Tests: Split RunCMake.target_link_libraries test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4908
2020-06-18 09:36:47 -04:00
Brad King
5127d981b3 Merge topic 'test-split-RunCMake.target_link_libraries'
5f97e44912 Tests: Shorten case names in RunCMake.target_link_libraries-* tests
0951b1fe07 Tests: Split RunCMake.target_link_libraries test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4908
2020-06-18 09:36:47 -04:00
Osama Moharam
2ff68c00e0 ARMClang: Fix typo in -Xlinker flag
Fix a typo from commit ef816610be (ARMClang: allow fallback to -march
and correct setting of --cpu flags, 2020-06-03, v3.18.0-rc1~18^2).
2020-06-18 07:43:22 -04:00
Craig Scott
947cfc732d Help: Explicitly say transaction, don't abbreviate to trans
The release notes need to make sense to people not so familiar with
each item. For those less familiar with RPM, spelling out "transaction"
makes this line item much clearer in isolation.
2020-06-18 20:43:46 +10:00
Craig Scott
90c73479bc Help: Correct and condense examples for VS_SOLUTION_DEPLOY 2020-06-18 20:43:46 +10:00
Craig Scott
0420de10b5 Help: Add missing cross-referencing for generator expressions 2020-06-18 20:43:46 +10:00
Craig Scott
013f7a2647 Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG> 2020-06-18 20:43:46 +10:00
Craig Scott
a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups 2020-06-18 20:26:03 +10:00
Craig Scott
95a16f7805 Help: Fix formatting error and consistency for gtest_discover_tests() 2020-06-18 20:23:57 +10:00
Kitware Robot
61aa9128c3 CMake Nightly Date Stamp 2020-06-18 00:02:13 -04:00
Brad King
843c39bf47 Merge topic 'doc-relnotes' into release-3.18
4f6ce41446 Help: Fix order of FindCUDAToolkit entry in 3.18 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4910
2020-06-17 13:45:12 -04:00
Brad King
f28c920e8d Merge branch 'release-3.18' 2020-06-17 13:45:12 -04:00
Brad King
65406b1cd7 Merge topic 'doc-relnotes'
4f6ce41446 Help: Fix order of FindCUDAToolkit entry in 3.18 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4910
2020-06-17 13:45:12 -04:00
Brad King
4f6ce41446 Help: Fix order of FindCUDAToolkit entry in 3.18 release notes 2020-06-17 11:28:31 -04:00
Brad King
aab150ef08 Merge branch 'release-3.18' 2020-06-17 10:46:11 -04:00
Brad King
e66fe75792 CMake 3.18.0-rc2 v3.18.0-rc2 2020-06-17 09:58:40 -04:00
Brad King
5f97e44912 Tests: Shorten case names in RunCMake.target_link_libraries-* tests
Drop the portion of the case names that repeats the name of the
containing test.
2020-06-17 08:13:57 -04:00
Marc Chevrier
0951b1fe07 Tests: Split RunCMake.target_link_libraries test
Fixes: #20836
2020-06-17 08:02:33 -04:00
Brad King
e70083ce51 Merge branch 'release-3.18' 2020-06-17 06:44:26 -04:00
Brad King
2ae33f7ace Merge topic 'cuda_clang_limitations' into release-3.18
bdb105ee94 Help: Mention CUDA Clang limitations in 3.18 release notes
fec7dd33d3 CUDA: Add issue number to Clang separable compilation error
14163d7d6b CUDA: Throw error for Clang on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4903
2020-06-17 06:44:25 -04:00
Brad King
55ade79ab8 Merge topic 'cuda_clang_limitations'
bdb105ee94 Help: Mention CUDA Clang limitations in 3.18 release notes
fec7dd33d3 CUDA: Add issue number to Clang separable compilation error
14163d7d6b CUDA: Throw error for Clang on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4903
2020-06-17 06:44:25 -04:00
Brad King
56134e3690 Merge topic 'test-file-GET_RUNTIME_DEPENDENCIES' into release-3.18
9ae3382855 Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test
248d0570c9 Tests: Factor out RunCMake.file-GET_RUNTIME_DEPENDENCIES test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4904
2020-06-17 06:43:22 -04:00
Brad King
f9f1067c17 Merge branch 'release-3.18' 2020-06-17 06:43:22 -04:00
Brad King
df0c97ab09 Merge topic 'test-file-GET_RUNTIME_DEPENDENCIES'
9ae3382855 Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test
248d0570c9 Tests: Factor out RunCMake.file-GET_RUNTIME_DEPENDENCIES test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4904
2020-06-17 06:43:22 -04:00
Brad King
66d323bd63 Merge topic 'test-CudaOnly.StaticRuntimePlusToolkit' into release-3.18
cb9fab49dd Tests: Fix CudaOnly.StaticRuntimePlusToolkit build rpath

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4901
2020-06-17 06:41:56 -04:00
Brad King
1523aba574 Merge branch 'release-3.18' 2020-06-17 06:41:56 -04:00
Brad King
652de07208 Merge topic 'test-CudaOnly.StaticRuntimePlusToolkit'
cb9fab49dd Tests: Fix CudaOnly.StaticRuntimePlusToolkit build rpath

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4901
2020-06-17 06:41:56 -04:00
Gusts Kaksis
58c05e1c73 Xcode: Use "Link Binary With Libraries" build phase when possible
Try linking all target linked libraries through frameworks build phase
instead of linker flags, thus letting Xcode manage build product paths
correctly.  Prevent adding duplicate entries to "Link Binary With
Libraries" build phase.

Add check for configuration-dependent linking - in case the library is
not present in all configurations revert back to linker flags which are
per-configuration.

This does change the order of libraries linked, but that does not seem
to matter for Apple linkers invoked by Xcode, even for static libraries.
The linker will go back and re-consider a static library from earlier
on the link line when more symbols from its objects are needed.

Fixes: #14185
2020-06-17 06:35:25 -04:00
Robert Maynard
574f71efba try_compile: Refactor language standard level parsing
cmCoreTryCompile had significant code duplication around handling
languages that offer standard levels. This refactoring reduces
the complexity and makes it easier to add new languages in the
future.
2020-06-17 06:30:39 -04:00
Kitware Robot
e96b5e4449 CMake Nightly Date Stamp 2020-06-17 00:03:25 -04:00
Asit Dhal
032506acc6 cmake: implement error handling in configure_file
Implement error handling in case it fails

Fixes: #20696
2020-06-17 05:22:34 +02:00