mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 15:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,153 Commits 2 Branches 401 Tags
9be792a5f0a3bf35743be5764d2be7f152169ca5
Commit Graph

49153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott 9be792a5f0 Merge branch 'release-3.18' 2020-07-21 07:19:02 -04:00
Craig Scott 8abeec58f3 Merge topic 'xcode-native-arch' 
26673bf480 Xcode: Explicitly specify default native architecture on macOS
ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5023
 2020-07-21 07:19:02 -04:00
Craig Scott 70dca1813d Merge topic 'xcode-native-arch' into release-3.18 
26673bf480 Xcode: Explicitly specify default native architecture on macOS
ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5023
 2020-07-21 07:19:02 -04:00
Kitware Robot cd580a99bd CMake Nightly Date Stamp 2020-07-21 00:02:32 -04:00
Brad King 26673bf480 Xcode: Explicitly specify default native architecture on macOS 
When `CMAKE_OSX_ARCHITECTURES` is not specified, we add the Xcode
setting `ONLY_ACTIVE_ARCH = YES` with the intention of targeting the
native architecture of the host.  However, the default `ARCHS` value
chosen by "Xcode 12 Universal Apps" includes multiple architectures.
Add an explicit `ARCHS` setting with value `$(NATIVE_ARCH_ACTUAL)`
to tell Xcode to use the host's native architecture only.

Fixes: #20893
 2020-07-20 10:03:15 -04:00
Brad King be0a224696 Merge topic 'fix-xcode12-arm64-tests' 
447ecbb692 Apple: also specify sysroot for linking
16692f4926 Apple: suppress Xcode 12 ranlib warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5028
 2020-07-20 09:58:02 -04:00
Brad King 6f67138822 Merge branch 'release-3.18' 2020-07-20 09:56:07 -04:00
Brad King beb78ada5e Merge topic 'swift-link-iface' 
14a5712447 Swift: Fix regression in linking to interface libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5027
 2020-07-20 09:56:07 -04:00
Brad King 61b0d2c95c Merge topic 'swift-link-iface' into release-3.18 
14a5712447 Swift: Fix regression in linking to interface libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5027
 2020-07-20 09:56:06 -04:00
Kitware Robot d66638400f CMake Nightly Date Stamp 2020-07-20 00:01:09 -04:00
Kitware Robot 7cebaf0390 CMake Nightly Date Stamp 2020-07-19 00:01:11 -04:00
Kitware Robot 8eef665d07 CMake Nightly Date Stamp 2020-07-18 00:01:11 -04:00
Gregor Jasny 447ecbb692 Apple: also specify sysroot for linking 
Otherwise the compiler/linker will default to the wrong C++ runtime
library.
 2020-07-17 15:46:29 +02:00
Gregor Jasny 16692f4926 Apple: suppress Xcode 12 ranlib warning 
The Xcode 12 (Beta) toolchain for arm64 emits a warning when static
libraries are created:

```
ranlib: archive member: libStaticLib.a(a.c.o) offset in archive not a multiple of 8 (must be since member is an 64-bit object file)
```

Due to the unexpected output multiple tests are broken. To make those
tests pass we filter the problematic output in the test driver.

See: https://developer.apple.com/forums/thread/652620
 2020-07-17 15:42:26 +02:00
Brad King f74a963021 Merge topic 'FindX11-Xaw' 
fa7157b86d FindX11: Add Xaw libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5024
 2020-07-17 08:54:06 -04:00
Brad King 5b419f795c Merge topic 'xcode-try_compile-no-sign' 
d3a64c4e3f Xcode: Explicitly turn off signing in try_compile projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5022
 2020-07-17 08:52:13 -04:00
Brad King 3442e8c551 Merge branch 'release-3.17' 2020-07-17 08:50:31 -04:00
Brad King 623e19e0cc Merge branch 'release-3.18' 2020-07-17 08:49:37 -04:00
Brad King 286411ed89 Merge topic 'ninja-multi-rsp' 
99ed39b011 Ninja Multi-Config: Make link response files per-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5020
 2020-07-17 08:49:37 -04:00
Brad King 290a68b94c Merge topic 'ninja-multi-rsp' into release-3.18 
99ed39b011 Ninja Multi-Config: Make link response files per-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5020
 2020-07-17 08:49:36 -04:00
Brad King 14a5712447 Swift: Fix regression in linking to interface libraries 
Since commit 2026915f8f (Swift: Propagate Swift_MODULE_DIRECTORY as include
directory, 2020-02-03, v3.18.0-rc1~547^2) we internally call
`GetAllConfigCompileLanguages` on all directly linked targets without
checking if they are interface libraries that don't compile at all.
That violates an internal assumption and assertion.

Fixes: #20977
 2020-07-17 08:26:40 -04:00
Kitware Robot 79cba639e8 CMake Nightly Date Stamp 2020-07-17 00:01:28 -04:00
Kurt Sansom fa7157b86d FindX11: Add Xaw libraries 
Fixes: #20963
 2020-07-16 14:16:24 -05:00
Brad King ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member 2020-07-16 14:17:47 -04:00
Brad King ffe425f768 Merge branch 'ninja-multi-rsp' into release-3.17 
Merge-request: !5020
 2020-07-16 12:02:54 -04:00
Kyle Edwards 99ed39b011 Ninja Multi-Config: Make link response files per-config 
Fixes: #20961
 2020-07-16 11:57:46 -04:00
Brad King d3a64c4e3f Xcode: Explicitly turn off signing in try_compile projects 
Fixes: #18407, #20571, #20688
 2020-07-16 10:42:39 -04:00
Brad King c7b7547d8d Merge topic 'cmake-E-create_hardlink' 
2fad00940d cmake: Add -E create_hardlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5015
 2020-07-16 10:19:12 -04:00
Brad King 4662c041ea Merge topic 'move_more_queries_to_cmStandardLevelResolver' 
56cf509a72 Move AddCompilerRequirementFlag to cmStandardLevelResolver

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4989
 2020-07-16 10:17:52 -04:00
Brad King ffb888b748 Merge topic 'macOS-sdk-latest' 
17e13fb6d0 macOS: Always pick latest SDK if user has not set one explicitly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5012
 2020-07-16 10:16:48 -04:00
Kitware Robot 78df084c7a CMake Nightly Date Stamp 2020-07-16 00:01:12 -04:00
Kyle Edwards 63ecf481da Merge topic 'cmnonempty' 
eaad8072ee cmNonempty: Convenience inlines to check for non-empty string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5017
 2020-07-15 10:53:43 -04:00
Sibi Siddharthan 2fad00940d cmake: Add -E create_hardlink 
Fixes: #20950
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-15 20:22:04 +05:30
Robert Maynard 56cf509a72 Move AddCompilerRequirementFlag to cmStandardLevelResolver 
The cmLocalGenerator::AddCompilerRequirementFlag was another
source of truth on what standard levels existed per language,
so fold that into cmStandardLevelResolver to make updating
CMake easier
 2020-07-15 09:40:33 -04:00
Brad King 36e00f9c84 Merge branch 'release-3.18' 2020-07-15 08:23:55 -04:00
Brad King d421274e3e CMake 3.18.0 v3.18.0 2020-07-15 07:19:20 -04:00
Brad King 67d809006f Merge topic 'xcode-lib-refs' 
3603ca8e86 Xcode: Special treatment for directly linked framework binaries
e637744c51 Xcode: Use "Link Binary With Libraries" to link any library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4975
 2020-07-15 06:50:22 -04:00
Brad King e169ec9c23 Merge topic 'compi-ti-improvements' 
98fea8205e Compiler/TI: Avoid response file usage for linker
5dec322f33 Compiler/TI: Add compiler flags to linker
763b44e519 Compiler/TI: Avoid usage of ranlib
ef528f10bf Compiler/TI: Sync ASM settings to C/CXX
a548a52230 Compiler/TI: Refactor C/CXX to use a common file
195aa488e3 Compiler/TI: Detect architecture

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5010
 2020-07-15 06:48:37 -04:00
Brad King 2d294219a5 Merge topic 'ison-stdstring' 
7156911242 cmIsOn: add overload accepting const std::string*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5013
 2020-07-15 06:47:46 -04:00
Brad King 4b406ecbf9 Merge branch 'release-3.18' 2020-07-15 06:46:22 -04:00
Brad King a62b4f1d2d Merge topic 'doc-find_package' 
cc92a4c228 Help: Fix typo in find_package documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5014
 2020-07-15 06:46:22 -04:00
Brad King 6b845e9066 Merge topic 'doc-find_package' into release-3.18 
cc92a4c228 Help: Fix typo in find_package documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5014
 2020-07-15 06:46:21 -04:00
Kai Koehne cc92a4c228 Help: Fix typo in find_package documentation 2020-07-15 06:44:33 -04:00
Brad King 91cb0db98d Merge branch 'release-3.18' 2020-07-15 06:42:57 -04:00
Brad King d1329ebc3e Merge topic 'nvcc_host' 
ff086f066b NVCC: Handle host compiler with spaces in path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5019
 2020-07-15 06:42:57 -04:00
Brad King 17f28f821f Merge topic 'nvcc_host' into release-3.18 
ff086f066b NVCC: Handle host compiler with spaces in path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5019
 2020-07-15 06:42:56 -04:00
Brad King 43bde847ae Merge topic 'doc-CMAKE_CUDA_HOST_COMPILER' 
7968d9d442 Help: Document CMAKE_CUDA_HOST_COMPILER as specific to NVIDIA nvcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5018
 2020-07-15 06:30:16 -04:00
Kitware Robot 84c9e14bc2 CMake Nightly Date Stamp 2020-07-15 00:01:43 -04:00
Craig Scott a335999021 Merge topic 'source_file_props_dedup_scopes' into release-3.18 
f6969b917d set_property: Deduplicate source file directory scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5009
 2020-07-14 18:59:39 -04:00
Craig Scott 92e30d576d Merge branch 'release-3.18' 2020-07-14 18:59:39 -04:00