mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,176 Commits 2 Branches 399 Tags
8efdd905f287c4a8e6b6156c2bf2b2df694d5495
Commit Graph

49176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 8efdd905f2 Merge branch 'backport-3.18-graphviz-restore-per-target' 2020-07-21 16:44:23 -04:00
Stephan Rohmen a78e991420 Tests: Cover Graphviz support for per-target dependency graph options 
Issue: #20928
 2020-07-21 15:02:21 -04:00
Brad King 370a94c487 Merge branch 'backport-3.17-graphviz-restore-per-target' 2020-07-21 15:02:09 -04:00
Brad King 1829220310 Merge branch 'backport-3.17-graphviz-restore-per-target' 2020-07-21 15:00:52 -04:00
Stephan Rohmen 93549b9224 Graphviz: Restore support for per-target dependency graph options 
The behaviors controlled by options `GRAPHVIZ_GENERATE_PER_TARGET` and
`GRAPHVIZ_GENERATE_DEPENDERS` were broken by commit 553658393c (Graphviz:
added test suite, fixes, enhancements, 2019-10-08, v3.17.0-rc1~615^2).
It had not been covered in the test suite previously, and those changes
left out checks for these features from the `default_options` case.

Implement the previously-existing behavior in the new graphviz
generation engine added by the above-mentioned commit.

Fixes: #20928
 2020-07-21 14:55:44 -04:00
Stephan Rohmen f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options 
Issue: #20928
 2020-07-21 14:55:44 -04:00
Brad King 51c14d4daf Merge topic 'tutorial-index-update' 
8a80b8fbe4 Tutorial: Clarify Steps 1, 2 and 3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5029
 2020-07-21 07:32:12 -04:00
Brad King 1c1ad45bd4 Merge topic 'stl-support-filesystem-path-cygwin' 
259356f3b5 STL Support: cm::filesystem::path: add support of Cygwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5032
 2020-07-21 07:31:06 -04:00
Brad King abfbed31bd Merge branch 'release-3.18' 2020-07-21 07:26:41 -04:00
Brad King ca8c7ee04c Merge topic 'ghs-crash' 
906ebe911e Merge branch 'backport-ghs-crash' into ghs-crash
5da2c71165 GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5033
 2020-07-21 07:26:41 -04:00
Brad King 19a0b5c544 Merge topic 'ghs-crash' into release-3.18 
5da2c71165 GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5033
 2020-07-21 07:26:41 -04:00
Brad King 9db5a8de68 Merge branch 'release-3.18' 2020-07-21 07:25:54 -04:00
Brad King dae9fd0d28 Merge topic 'bootstrap-system-http2' into release-3.18 
64bc82bb4d bootstrap: Add options to control use of system nghttp2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christoph Grüninger <foss@grueninger.de>
Merge-request: !5031
 2020-07-21 07:25:54 -04:00
Brad King 2768698ba0 Merge topic 'bootstrap-system-http2' 
64bc82bb4d bootstrap: Add options to control use of system nghttp2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christoph Grüninger <foss@grueninger.de>
Merge-request: !5031
 2020-07-21 07:25:54 -04:00
Brad King 21bebd2d4b Merge topic 'strdup' into release-3.18 
eea0337c7d centos5: Fix FTBFS with strdup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5026
 2020-07-21 07:25:02 -04:00
Brad King 5ba2a3d1c0 Merge branch 'release-3.18' 2020-07-21 07:25:02 -04:00
Brad King 2683d72f96 Merge topic 'strdup' 
eea0337c7d centos5: Fix FTBFS with strdup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5026
 2020-07-21 07:25: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
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
Kitware Robot cd580a99bd CMake Nightly Date Stamp 2020-07-21 00:02:32 -04:00
Brad King 906ebe911e Merge branch 'backport-ghs-crash' into ghs-crash 2020-07-20 10:51:02 -04:00
Brad King 5da2c71165 GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not defined 
Refactoring in commit 36aba01223 (cmGeneratorTarget::GetProperty: return
cmProp, 2020-04-29, v3.18.0-rc1~246^2) left out a `nullptr` check.

Fixes: #20985
 2020-07-20 10:41:41 -04:00
Marc Chevrier 259356f3b5 STL Support: cm::filesystem::path: add support of Cygwin 2020-07-20 16:20:42 +02:00
Brad King 64bc82bb4d bootstrap: Add options to control use of system nghttp2 
Add `bootstrap` options needed since commit 0b872fd4be (nghttp2: Build
the library within CMake for use by our curl, 2020-04-01,
v3.18.0-rc1~408^2~2).

Fixes: #20987
 2020-07-20 10:16:07 -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
Julien Schueller eea0337c7d centos5: Fix FTBFS with strdup 
Since commit f034b0f663 (CMake compilation: do not use compiler
extensions, 2020-03-14, v3.18.0-rc1~494^2) we need to explicitly enable
availability of `strdup`.

Fixes: #20971
 2020-07-20 08:21:40 +02: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
Betsy McPhail 8a80b8fbe4 Tutorial: Clarify Steps 1, 2 and 3 2020-07-17 12:17:26 -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