summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmprop-gt'Brad King2020-04-3032-649/+644
|\ | | | | | | | | | | | | 36aba01223 cmGeneratorTarget::GetProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4686
| * cmGeneratorTarget::GetProperty: return cmPropVitaly Stakhovsky2020-04-2932-649/+644
| |
* | Merge topic 'cm_cxx_features-libhugetlbfs'Brad King2020-04-301-0/+2
|\ \ | | | | | | | | | | | | | | | | | | 4ab0d37b41 cm_cxx_features: Filter out libhugetlbfs warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4681
| * | cm_cxx_features: Filter out libhugetlbfs warningsJennifer Green2020-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, CMake fails to build on Cray systems with a craype-hugepages modulefile loaded on the front-end due to libhugetlbfs warnings breaking the CXX Feature tests. Filter out the warnings so the bootstrap can proceed to successfully install CMake on Cray Linux systems. Fixes: #20645
| * | CMake 3.17.2v3.17.2Brad King2020-04-281-1/+1
| | |
| * | Merge topic 'makefile-objc' into release-3.17Brad King2020-04-282-3/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4d09fdc6d Makefiles: Add Objective C/C++ compilations to compile_commands.json 98aa628f0b Makefiles: Scan Objective C/C++ preprocessor dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4675
* | | | CMake Nightly Date StampKitware Robot2020-04-301-1/+1
| |_|/ |/| |
* | | Merge topic 'vs_platform_toolset'Brad King2020-04-291-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 197b4cbe18 VS: Add option for per-target PlatformToolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4682
| * | | VS: Add option for per-target PlatformToolsetJulien Jemine2020-04-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `VS_PLATFORM_TOOLSET` target property to set `PlatformToolset` in the `.vcxproj` file for specific targets. Document that this is safe only when the named toolset uses the same underlying compiler as the primary toolset. Fixes: #17429
* | | | CMake Nightly Date StampKitware Robot2020-04-291-1/+1
|/ / /
* | | Merge topic 'stdstring-fformat'Brad King2020-04-285-18/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4fd28b9911 cmOutputConverter::GetFortranFormat(): delete const char* overload Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4671
| * | | cmOutputConverter::GetFortranFormat(): delete const char* overloadVitaly Stakhovsky2020-04-275-18/+8
| | | |
* | | | Merge topic 'cmake-gui-empty-compiler'Brad King2020-04-281-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a0c17f704 cmake-gui: Do not pass CMAKE_{C,CXX}_COMPILER items to cmake if empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4664
| * | | | cmake-gui: Do not pass CMAKE_{C,CXX}_COMPILER items to cmake if emptyJiri Malak2020-04-271-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If C or C++ compiler is not specified in the initial dialog, do not pass `CMAKE_C_COMPILER` or `CMAKE_CXX_COMPILER` cache entries for cross-compilation setup. Instead allow the normal search for the compiler to proceed.
* | | | | Merge topic 'wmake-null'Brad King2020-04-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 511a03f933 Watcom WMake: Use wmake internal %null command for empty command list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4670
| * | | | | Watcom WMake: Use wmake internal %null command for empty command listJiri Malak2020-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wmake internal command %null realy do "nothing". It is designed to use in command lists.
* | | | | | Merge topic 'makefile-objc'Brad King2020-04-282-3/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4d09fdc6d Makefiles: Add Objective C/C++ compilations to compile_commands.json 98aa628f0b Makefiles: Scan Objective C/C++ preprocessor dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4675
| * | | | | Makefiles: Add Objective C/C++ compilations to compile_commands.jsonBrad King2020-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20634
| * | | | | Makefiles: Scan Objective C/C++ preprocessor dependenciesBrad King2020-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20635
* | | | | | CMake Nightly Date StampKitware Robot2020-04-281-1/+1
| | | | | |
* | | | | | Merge topic 'ccmake-custom-colors'Brad King2020-04-273-8/+60
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 671fe28313 ccmake: Improve coloring, allow customization f56a695440 ccmake: Rename cmCursesColor::{Options => Choice} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4629
| * | | | | ccmake: Improve coloring, allow customizationMatthew Woehlke2020-04-242-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default color for strings from BLUE (which is nearly illegible on any terminals using the standard color palette which has been around since at least CGA, almost 40 years ago) to CYAN. Add ability to customize the colors via an environment variable (inspired by LS_COLORS and using similar syntax). Fixes: #20596
| * | | | | ccmake: Rename cmCursesColor::{Options => Choice}Matthew Woehlke2020-04-243-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the internal name for the color applied to multiple-choice options to avoid use of the overloaded term 'option'.
* | | | | | CMake Nightly Date StampKitware Robot2020-04-271-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2020-04-261-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2020-04-251-1/+1
| | | |
* | | | Merge topic 'ninja-order-only-fix'Brad King2020-04-243-6/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d837f8b6fb Merge branch 'master' into ninja-order-only-fix b45976fe10 Ninja: Remove config suffix from order-only target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4654
| * \ \ \ Merge branch 'master' into ninja-order-only-fixKyle Edwards2020-04-23291-5122/+7391
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Ninja: Remove config suffix from order-only targetKyle Edwards2020-04-233-6/+15
| | | | | | | | | | | | | | | | | | | | Fixes: #20621
| * | | | Merge topic 'apple-merge-same-sysroot' into release-3.17Brad King2020-04-222-1/+24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4647
| * \ \ \ \ Merge topic 'cpack-symlinks' into release-3.17Brad King2020-04-222-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcc5cd44ed CPack: Do not recurse through directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4637
* | | | | | | CMake Nightly Date StampKitware Robot2020-04-241-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'remove-documentation-module'Brad King2020-04-232-2/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 306a1ba960 Modules/Documentation: remove ad4487a96a cmIncludeCommand: add infrastructure for deprecated modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4617
| * | | | | | Modules/Documentation: removeBen Boeckel2020-04-222-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an old module from when VTK and other Kitware projects drove the addition of commands and modules into CMake itself. Modern VTK doesn't need this module and it can be ignored. This module is kept around so that the ancient VTK versions which use it are not broken by it. VTK itself stopped using the module in 2012 and the last usage by an example in VTK was removed in 2020. Fixes: #20591
| * | | | | | cmIncludeCommand: add infrastructure for deprecated modulesBen Boeckel2020-04-211-1/+31
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-04-231-1/+1
| | | | | | |
* | | | | | | Merge topic 'win-user-manifest-rc'Brad King2020-04-221-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ca13e04fa Windows: Merge user-provided manifests into compiled resource Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4484
| * | | | | | | Windows: Merge user-provided manifests into compiled resourceKenney Phillis2020-04-211-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we merged user-provided manifests only into the manifest file given to the linker. Merge them into the manifest file that is compiled as a resource too.
* | | | | | | | Merge topic 'ctest_stop_on_failure_16628'Brad King2020-04-228-1/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e89aeba5c4 ctest: add option --stop-on-failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4630
| * | | | | | | | ctest: add option --stop-on-failureJohnny Jazeix2020-04-208-1/+40
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To stop the tests once one has failed Fixes: #16628
* | | | | | | | Merge topic 'update-kwsys'Brad King2020-04-221-1/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8191d39119 Merge branch 'upstream-KWSys' into update-kwsys e833e660ef KWSys 2020-04-21 (44086372) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4646
| * | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-21 (44086372)
* | | | | | | | | Merge topic 'apple-merge-same-sysroot'Brad King2020-04-222-1/+24
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4647
| * | | | | | | | Apple: Merge per-arch sysroot parameters if all are the sameGregor Jasny2020-04-212-1/+24
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a9b41195d2 (Handle multi-arch sysroots on Apple platforms, 2019-07-26, v3.17.0-rc1~287^2), CMake supports "fat" builds with different sysroots. Those are passed to the compiler with the `-Xarch_<xyz>` parameter. Unfortunately this breaks the Compiler Cache (ccache) because it does not support those compiler flags: https://github.com/ccache/ccache/blob/v3.7.9/src/ccache.c#L2700-L2705 Restore the caching ability for certain "fat" build configurations (e.g. `arm64` and `armv7`) where the sysroot is the same for all selected architectures and thus a plain `-isysroot` parameter could be used.
| * | | | | | | Merge topic 'ninja-fortran-doc' into release-3.17Brad King2020-04-201-8/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4626
| * \ \ \ \ \ \ \ Merge topic 'ibmi-aix-exports' into release-3.17Brad King2020-04-151-2/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 420e91c951 AIX: Activate symbol export/import IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4611
| * | | | | | | | | file(UPLOAD): Add default ca_certsHarry Mallon2020-04-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default ca_certs were not added when using `UPLOAD` with built-in (non-system) cURL. Previously we only did this for `DOWNLOAD`. Fixes: #20551
* | | | | | | | | | Merge topic 'cpack-symlinks'Brad King2020-04-222-0/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcc5cd44ed CPack: Do not recurse through directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4637
| * | | | | | | | | CPack: Do not recurse through directory symlinksBrad King2020-04-212-0/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 7b8dcdd173 (CPack: Do not recurse through directory symlinks (#12284), 2011-08-27, v2.8.6~55^2) to more places in CPack. Issue: #12284
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-221-1/+1
| | | | | | | | |