summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Add option for per-target PlatformToolsetJulien Jemine2020-04-297-2/+68
| | | | | | | | | 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
* Merge topic 'FindLAPACK-target'Brad King2020-04-286-0/+73
|\ | | | | | | | | | | | | 4ed936d1b8 FindLAPACK: Provide the LAPACK::LAPACK import target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4677
| * FindLAPACK: Provide the LAPACK::LAPACK import targetRobert Maynard2020-04-276-0/+73
| |
* | 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 branch 'release-3.17'Brad King2020-04-280-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-04-281-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69ed51960b FindBoost: Prevent warning with boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4662
* | \ \ \ \ \ Merge topic 'FindBoost-1.73'Brad King2020-04-281-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69ed51960b FindBoost: Prevent warning with boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4662
| * | | | | | FindBoost: Prevent warning with boost 1.73Orgad Shaneh2020-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19) we forgot to update the version comparison for the warning.
* | | | | | | Merge branch 'release-3.16'Brad King2020-04-280-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'makefile-objc' into release-3.16Brad King2020-04-282-3/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4675
| * \ \ \ \ \ \ \ Merge branch 'pch-genex-absolute' into release-3.16Brad King2020-04-275-16/+19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4678
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-04-280-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | 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
* | | | | | | | | | 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
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-04-280-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'pch-genex-absolute' into release-3.17Brad King2020-04-285-16/+19
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b204bae261 target_precompile_headers: Fix documented example using genex Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !4678
* | | | | | | | | | Merge topic 'pch-genex-absolute'Brad King2020-04-285-16/+19
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b204bae261 target_precompile_headers: Fix documented example using genex Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !4678
| * | | | | | | | | target_precompile_headers: Fix documented example using genexBrad King2020-04-275-16/+19
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path to a header file is specified using a generator expression, evaluation of the genex must produce an absolute path. Update our documented example and add a test covering the case. Fixes: #20617
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |