summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2020-04-281-1/+1
|
* Merge topic 'doc-install-dir-order'Brad King2020-04-271-4/+6
|\ | | | | | | | | | | | | | | | | 0315d269c2 Help: Reference policy CMP0082 from install() command docs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Acked-by: Roscoe A. Bartlett <rabartl@sandia.gov> Merge-request: !4672
| * Help: Reference policy CMP0082 from install() command docsBrad King2020-04-271-4/+6
| | | | | | | | | | The policy plays an important role in the behavior of the `install()` command, so the latter's documentation should mention it.
* | Merge topic 'tutorial-restore-maketable-step-6'Brad King2020-04-271-0/+25
|\ \ | | | | | | | | | | | | | | | | | | dd62ee376e Tutorial: Restore MakeTable.cxx in step 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4674
| * | Tutorial: Restore MakeTable.cxx in step 6Brad King2020-04-271-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit c754a3d4b7 (Tutorial: Remove MakeTable.cxx from Steps 5 and 6, 2020-04-23) it was incorrect to remove the file from step 6. The instructions for that step show the addition of a reference to it from the `CMakeLists.txt` file. Each step shows the addition of content to lead to the next step, so removing the file from step 6 was an off-by-one error. Issue: #20618
* | | Merge branch 'release-3.17'Brad King2020-04-270-0/+0
|\ \ \
| * \ \ Merge topic 'FindPython-reason-failure' into release-3.17Brad King2020-04-271-21/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7eca04163 FindPython: fix reason failure propagation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4660
* | \ \ \ Merge topic 'FindPython-reason-failure'Brad King2020-04-271-21/+23
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | a7eca04163 FindPython: fix reason failure propagation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4660
| * | | | FindPython: fix reason failure propagationMarc Chevrier2020-04-241-21/+23
| |/ / /
* | | | Merge topic 'ccmake-custom-colors'Brad King2020-04-276-8/+107
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-245-5/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'.
* | | | | Merge topic 'FindBLAS-target'Brad King2020-04-276-0/+65
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 85a9813a76 BLAS: Provide the BLAS::BLAS import target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4657
| * | | | BLAS: Provide the BLAS::BLAS import targetRobert Maynard2020-04-236-0/+65
| | | | |
* | | | | 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 branch 'release-3.17'Brad King2020-04-240-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'FindPython-fix-python-compiler-validation' into release-3.17Brad King2020-04-245-19/+129
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f39da773ee FindPython: fix python compiler validation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4655
* | \ \ \ \ Merge topic 'FindPython-fix-python-compiler-validation'Brad King2020-04-245-19/+129
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f39da773ee FindPython: fix python compiler validation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4655
| * | | | | FindPython: fix python compiler validationMarc Chevrier2020-04-235-19/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure also the cache of properties is erased in case of multiple searches. Fixes: #20626, #20627
* | | | | | Merge branch 'release-3.17'Brad King2020-04-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'ninja-order-only-fix' into release-3.17Brad King2020-04-245-6/+36
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b45976fe10 Ninja: Remove config suffix from order-only target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4654
* | | | | | Merge topic 'ninja-order-only-fix'Brad King2020-04-245-6/+36
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231764-173238/+81753
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Ninja: Remove config suffix from order-only targetKyle Edwards2020-04-235-6/+36
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #20621
* | | | | Merge topic 'tutorial-remove-maketable'Brad King2020-04-242-50/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c754a3d4b7 Tutorial: Remove MakeTable.cxx from Steps 5 and 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4658
| * | | | | Tutorial: Remove MakeTable.cxx from Steps 5 and 6Betsy McPhail2020-04-232-50/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is not referenced until Step 6 and, therefore, should be added to the source code at Step 7. Fixes: #20618
* | | | | Merge topic 'tutorial-step5-clarify'Brad King2020-04-241-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0797f62d9 Tutorial: Clarify Step 5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4656
| * | | | | Tutorial: Clarify Step 5Betsy McPhail2020-04-231-2/+6
| |/ / / / | | | | | | | | | | | | | | | Fixes: #20619
* | | | | CMake Nightly Date StampKitware Robot2020-04-241-1/+1
|/ / / /
* | | | Merge topic 'remove-documentation-module'Brad King2020-04-2321-2/+201
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2221-1/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
* | | | | Merge topic 'ninja-compiler-PATH-windows'Brad King2020-04-2311-0/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e01990999a Ninja: On Windows, select the compiler occurring first in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4625
| * | | | | Ninja: On Windows, select the compiler occurring first in PATHBrad King2020-04-2211-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, toolchains like MSVC require a set of environment variables to be configured for the compiler to work correctly. The scripts that prepare these environments typically put the compiler's directory ahead of others in the `PATH`. Teach the Ninja generators to use this as a heuristic to select the compiler when none is explicitly specified. This is not necessary with Makefile generators because each toolchain's environment comes with its own make tool variant, and the corresponding Makefile generator (e.g. "NMake Makefiles") automatically implies the matching compiler. Fixes: #20585
* | | | | | Merge topic 'doc_separate_arguments_typo'Craig Scott2020-04-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6872432e6 Help: Fixed typo in command/separate_arguments.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4651
| * | | | | | Help: Fixed typo in command/separate_arguments.rstJaak Ristioja2020-04-221-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-04-231-1/+1
|/ / / / / /
* | | | | | Merge topic 'win-user-manifest-rc'Brad King2020-04-2210-8/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2110-8/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2217-1/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2017-1/+106
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To stop the tests once one has failed Fixes: #16628
* | | | | | | Merge topic 'FindSquish-windows'Brad King2020-04-222-10/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c77c92791c FindSquish: Fix setting the application under test 879b279154 FindSquish: Fix launching the Squish server process on Windows 0bc4fa2be2 FindSquish: Fix finding on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4620
| * | | | | | | FindSquish: Fix setting the application under testFrederik Gladhorn2020-04-201-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AUT (application under test) was previously set by trying to extract the target location, which is no longer supported.
| * | | | | | | FindSquish: Fix launching the Squish server process on WindowsFrederik Gladhorn2020-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are countless posts (e.g. stack overflow) that start /b takes a window title as first argument. Once I added a random string there the server was started and things started to work.
| * | | | | | | FindSquish: Fix finding on WindowsFrederik Gladhorn2020-04-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whole script looks rather dated and dusty, but it actually does find newer Squish versions - e.g. version 6.5 here. I assume more work is needed, but at least with this tiny patch the path is located on Windws when the SQUISH_INSTALL_DIR environment variable is set.
* | | | | | | | 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)
| | * | | | | | | | KWSys 2020-04-21 (44086372)KWSys Upstream2020-04-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4408637212fe1ddf09425beba97e105009734e31 (master). Upstream Shortlog ----------------- Hernan Martinez (1): 00629420 SystemInformation: Add support for Windows on ARM64