summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'EXCLUDE_FROM_ALL-genex'Brad King2020-07-2220-14/+168
|\ | | | | | | | | | | | | 2cdaf43d96 Allow generator expressions in the EXCLUDE_FROM_ALL target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5021
| * Allow generator expressions in the EXCLUDE_FROM_ALL target propertyJoerg Bornemann2020-07-2120-14/+168
| | | | | | | | | | | | | | | | | | 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
* | Merge topic 'TARGET_PROPERTY-strip-empty-list-elements'Brad King2020-07-224-7/+31
|\ \ | | | | | | | | | | | | | | | | | | af1a4f52be Genex: $<TARGET_PROPERTY> strip emtpy list elements for predefined properties Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5030
| * | Genex: $<TARGET_PROPERTY> strip emtpy list elements for predefined propertiesMarc Chevrier2020-07-214-7/+31
| | | | | | | | | | | | Fixes: #20951
* | | Merge branch 'release-3.18'Brad King2020-07-220-0/+0
|\ \ \
| * \ \ Merge topic 'aux-install-dest' into release-3.18Brad King2020-07-222-8/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83bc79e232 Auxiliary: Add options to control Vim and Emacs file installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5035
* | \ \ \ Merge topic 'aux-install-dest'Brad King2020-07-222-8/+25
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 83bc79e232 Auxiliary: Add options to control Vim and Emacs file installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5035
| * | | | Auxiliary: Add options to control Vim and Emacs file installationBrad King2020-07-212-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'release-3.17'Brad King2020-07-220-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backport-3.17-graphviz-restore-per-target' into release-3.17Brad King2020-07-215-7/+201
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5039
* | \ \ \ \ \ Merge branch 'release-3.18'Brad King2020-07-220-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'graphviz-restore-per-target' into release-3.18Brad King2020-07-225-7/+201
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ Merge topic 'graphviz-restore-per-target'Brad King2020-07-225-7/+209
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'backport-3.18-graphviz-restore-per-target'Brad King2020-07-210-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'backport-3.17-graphviz-restore-per-target'Brad King2020-07-215-7/+201
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | / / / | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Tests: Cover Graphviz support for per-target dependency graph optionsStephan Rohmen2020-07-213-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20928
| * | | | | | | Tests: Cover Graphviz support for per-target dependency graph optionsStephan Rohmen2020-07-213-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20928
| * | | | | | | Merge branch 'backport-3.17-graphviz-restore-per-target'Brad King2020-07-212-7/+145
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Graphviz: Restore support for per-target dependency graph optionsStephan Rohmen2020-07-212-7/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-221-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'debug_posfix_doc'Brad King2020-07-211-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d103e34030 Documentation: Add missing links to `DEBUG_POSTFIX` target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5037
| * | | | | | | Documentation: Add missing links to `DEBUG_POSTFIX` target propertyBetsy McPhail2020-07-211-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to the `<CONFIG>_POSTFIX` target property when it is referenced in the `DEBUG_POSTFIX` documentation.
* | | | | | | Merge topic 'tutorial-index-update'Brad King2020-07-211-23/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a80b8fbe4 Tutorial: Clarify Steps 1, 2 and 3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5029
| * | | | | | | Tutorial: Clarify Steps 1, 2 and 3Betsy McPhail2020-07-171-23/+55
| | | | | | | |
* | | | | | | | Merge topic 'stl-support-filesystem-path-cygwin'Brad King2020-07-212-17/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 259356f3b5 STL Support: cm::filesystem::path: add support of Cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5032
| * | | | | | | | STL Support: cm::filesystem::path: add support of CygwinMarc Chevrier2020-07-202-17/+59
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ghs-crash' into release-3.18Brad King2020-07-211-2/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5da2c71165 GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not defined Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5033
* | \ \ \ \ \ \ \ \ Merge topic 'ghs-crash'Brad King2020-07-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-ghs-crash' into ghs-crashBrad King2020-07-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not definedBrad King2020-07-201-2/+3
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 36aba01223 (cmGeneratorTarget::GetProperty: return cmProp, 2020-04-29, v3.18.0-rc1~246^2) left out a `nullptr` check. Fixes: #20985
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'bootstrap-system-http2' into release-3.18Brad King2020-07-211-2/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ Merge topic 'bootstrap-system-http2'Brad King2020-07-211-2/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | bootstrap: Add options to control use of system nghttp2Brad King2020-07-201-2/+4
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'strdup' into release-3.18Brad King2020-07-211-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eea0337c7d centos5: Fix FTBFS with strdup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5026
* | \ \ \ \ \ \ \ \ Merge topic 'strdup'Brad King2020-07-211-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eea0337c7d centos5: Fix FTBFS with strdup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5026
| * | | | | | | | | centos5: Fix FTBFS with strdupJulien Schueller2020-07-201-0/+4
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'release-3.18'Craig Scott2020-07-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'xcode-native-arch' into release-3.18Craig Scott2020-07-215-1/+41
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ Merge topic 'xcode-native-arch'Craig Scott2020-07-215-1/+41
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Xcode: Explicitly specify default native architecture on macOSBrad King2020-07-204-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in memberBrad King2020-07-162-0/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-07-211-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'fix-xcode12-arm64-tests'Brad King2020-07-202-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447ecbb692 Apple: also specify sysroot for linking 16692f4926 Apple: suppress Xcode 12 ranlib warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5028
| * | | | | | | | Apple: also specify sysroot for linkingGregor Jasny2020-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the compiler/linker will default to the wrong C++ runtime library.
| * | | | | | | | Apple: suppress Xcode 12 ranlib warningGregor Jasny2020-07-171-0/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'release-3.18'Brad King2020-07-200-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'swift-link-iface' into release-3.18Brad King2020-07-202-0/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14a5712447 Swift: Fix regression in linking to interface libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5027