mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,193 Commits 2 Branches 391 Tags
63af35019ad6fb2f3b2fa81fabe4e3e5d9be46b1
Commit Graph

49193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betsy McPhail
63af35019a Tutorial: Add missing language option to literalinclude 2020-07-22 16:17:41 -04:00
Brad King
d45f0d719e Merge topic 'EXCLUDE_FROM_ALL-genex' 
2cdaf43d96 Allow generator expressions in the EXCLUDE_FROM_ALL target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5021
 2020-07-22 11:23:34 -04:00
Brad King
1f8bbfec0f Merge topic 'TARGET_PROPERTY-strip-empty-list-elements' 
af1a4f52be Genex: $<TARGET_PROPERTY> strip emtpy list elements for predefined properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5030
 2020-07-22 08:47:58 -04:00
Brad King
8bbbc49cc1 Merge branch 'release-3.18' 2020-07-22 08:46:01 -04:00
Brad King
f9e679d9f2 Merge topic 'aux-install-dest' 
83bc79e232 Auxiliary: Add options to control Vim and Emacs file installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5035
 2020-07-22 08:46:01 -04:00
Brad King
24571e8eca Merge topic 'aux-install-dest' into release-3.18 
83bc79e232 Auxiliary: Add options to control Vim and Emacs file installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5035
 2020-07-22 08:46:00 -04:00
Brad King
21acf596cb Merge branch 'release-3.17' 2020-07-22 08:43:05 -04:00
Brad King
b323470348 Merge branch 'release-3.18' 2020-07-22 08:42:37 -04:00
Brad King
3e14b15f44 Merge topic 'graphviz-restore-per-target' 
8efdd905f2 Merge branch 'backport-3.18-graphviz-restore-per-target'
a78e991420 Tests: Cover Graphviz support for per-target dependency graph options
370a94c487 Merge branch 'backport-3.17-graphviz-restore-per-target'
1829220310 Merge branch 'backport-3.17-graphviz-restore-per-target'
f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options
93549b9224 Graphviz: Restore support for per-target dependency graph options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5039
 2020-07-22 08:42:37 -04:00
Brad King
c8a6da06d2 Merge topic 'graphviz-restore-per-target' into release-3.18 
1829220310 Merge branch 'backport-3.17-graphviz-restore-per-target'
f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options
93549b9224 Graphviz: Restore support for per-target dependency graph options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5039
 2020-07-22 08:42:36 -04:00
Kitware Robot
5ac007f41c CMake Nightly Date Stamp 2020-07-22 00:01:19 -04:00
Brad King
8efdd905f2 Merge branch 'backport-3.18-graphviz-restore-per-target' 2020-07-21 16:44:23 -04:00
Brad King
e817818926 Merge branch 'backport-3.17-graphviz-restore-per-target' into release-3.17 
Merge-request: !5039
 2020-07-21 16:35:53 -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
f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options 
Issue: #20928
 2020-07-21 14:55:44 -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
Brad King
c8706cf165 Merge topic 'debug_posfix_doc' 
d103e34030 Documentation: Add missing links to `DEBUG_POSTFIX` target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5037
 2020-07-21 13:37:22 -04:00
Betsy McPhail
d103e34030 Documentation: Add missing links to DEBUG_POSTFIX target property 
Add links to the `<CONFIG>_POSTFIX` target property when it is
referenced in the `DEBUG_POSTFIX` documentation.
 2020-07-21 12:53:53 -04:00
Joerg Bornemann
2cdaf43d96 Allow generator expressions in the EXCLUDE_FROM_ALL target property 
This allows for setting EXCLUDE_FROM_ALL, conditional on the build
configuration. However, only the Ninja Multi-Config generator supports
different property values per config. All other multi-config
generators will yield an error in that situation.

Fixes: #20923
 2020-07-21 17:16:26 +02:00
Marc Chevrier
af1a4f52be Genex: $<TARGET_PROPERTY> strip emtpy list elements for predefined properties 
Fixes: #20951
 2020-07-21 15:08:28 +02:00
Brad King
83bc79e232 Auxiliary: Add options to control Vim and Emacs file installation 
Since commit 2642f432ef (Aux: Install editor and bash files to more
natural locations, 2020-03-30, v3.18.0-rc1~429^2) these files are
installed by default into locations that are not CMake-specific but may
be distro-specific.  Add options for packagers to control these
locations.

Also rename the `CMAKE_BASH_COMP_DIR` option to follow our conventions.

Fixes: #20993
 2020-07-21 08:34:30 -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
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
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
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
9db5a8de68 Merge branch 'release-3.18' 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