Commit Graph

47899 Commits

Author SHA1 Message Date
Kitware Robot fa3acd14ee CMake Nightly Date Stamp 2020-04-29 00:01:16 -04:00
Brad King 2d71e467a2 Merge branch 'release-3.17' 2020-04-28 11:36:58 -04:00
Brad King 615129f3eb CMake 3.17.2 v3.17.2 2020-04-28 10:23:06 -04:00
Brad King 73f81c5070 Merge topic 'FindLAPACK-target'
4ed936d1b8 FindLAPACK: Provide the LAPACK::LAPACK import target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4677
2020-04-28 07:18:41 -04:00
Brad King 4a0fbba1f2 Merge topic 'stdstring-fformat'
4fd28b9911 cmOutputConverter::GetFortranFormat(): delete const char* overload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4671
2020-04-28 07:17:56 -04:00
Brad King d7a1d0dc43 Merge topic 'cmake-gui-empty-compiler'
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
2020-04-28 07:17:13 -04:00
Brad King 75f7b66517 Merge topic 'wmake-null'
511a03f933 Watcom WMake: Use wmake internal %null command for empty command list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4670
2020-04-28 07:16:18 -04:00
Brad King 8a1c39f3aa Merge branch 'release-3.17' 2020-04-28 07:14:09 -04:00
Brad King 4bc4e14899 Merge topic 'FindBoost-1.73'
69ed51960b FindBoost: Prevent warning with boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4662
2020-04-28 07:14:09 -04:00
Brad King ee1dd905c0 Merge topic 'FindBoost-1.73' into release-3.17
69ed51960b FindBoost: Prevent warning with boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4662
2020-04-28 07:14:08 -04:00
Brad King 9446123911 Merge branch 'release-3.16' 2020-04-28 07:11:25 -04:00
Brad King 9062bb676f Merge branch 'release-3.17' 2020-04-28 07:10:08 -04:00
Brad King 9db6583531 Merge topic 'makefile-objc' into release-3.17
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
2020-04-28 07:10:07 -04:00
Brad King 0ce29c7c1d Merge topic 'makefile-objc'
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
2020-04-28 07:10:07 -04:00
Brad King 6b6f6e237b Merge branch 'release-3.17' 2020-04-28 07:09:01 -04:00
Brad King 25cbd22afb Merge topic 'pch-genex-absolute'
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
2020-04-28 07:09:01 -04:00
Brad King 41d37e45e9 Merge topic 'pch-genex-absolute' into release-3.17
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
2020-04-28 07:09:00 -04:00
Brad King a9490db798 Merge branch 'makefile-objc' into release-3.16
Merge-request: !4675
2020-04-28 07:04:44 -04:00
Brad King c4d09fdc6d Makefiles: Add Objective C/C++ compilations to compile_commands.json
Fixes: #20634
2020-04-28 07:03:07 -04:00
Brad King 98aa628f0b Makefiles: Scan Objective C/C++ preprocessor dependencies
Fixes: #20635
2020-04-28 07:03:07 -04:00
Kitware Robot ee1689f961 CMake Nightly Date Stamp 2020-04-28 00:01:13 -04:00
Orgad Shaneh 69ed51960b FindBoost: Prevent warning with boost 1.73
In commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19)
we forgot to update the version comparison for the warning.
2020-04-27 14:34:02 -04:00
Robert Maynard 4ed936d1b8 FindLAPACK: Provide the LAPACK::LAPACK import target 2020-04-27 14:19:02 -04:00
Brad King 1d39c1e27b Merge branch 'pch-genex-absolute' into release-3.16
Merge-request: !4678
2020-04-27 14:15:52 -04:00
Brad King b204bae261 target_precompile_headers: Fix documented example using genex
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
2020-04-27 14:12:41 -04:00
Jiri Malak 7a0c17f704 cmake-gui: Do not pass CMAKE_{C,CXX}_COMPILER items to cmake if empty
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.
2020-04-27 11:12:25 -04:00
Jiri Malak 511a03f933 Watcom WMake: Use wmake internal %null command for empty command list
wmake internal command %null realy do "nothing".

It is designed to use in command lists.
2020-04-27 11:05:19 -04:00
Brad King 265fb71c91 Merge topic 'doc-install-dir-order'
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
2020-04-27 10:42:56 -04:00
Brad King 40ea6b328b Merge topic 'tutorial-restore-maketable-step-6'
dd62ee376e Tutorial: Restore MakeTable.cxx in step 6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4674
2020-04-27 10:42:11 -04:00
Brad King faf635df0e Merge branch 'release-3.17' 2020-04-27 10:41:21 -04:00
Brad King 354c681434 Merge topic 'FindPython-reason-failure' into release-3.17
a7eca04163 FindPython: fix reason failure propagation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4660
2020-04-27 10:41:20 -04:00
Brad King 9e3d982e05 Merge topic 'FindPython-reason-failure'
a7eca04163 FindPython: fix reason failure propagation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4660
2020-04-27 10:41:20 -04:00
Brad King 0e3a2d9b16 Merge topic 'ccmake-custom-colors'
671fe28313 ccmake: Improve coloring, allow customization
f56a695440 ccmake: Rename cmCursesColor::{Options => Choice}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4629
2020-04-27 10:40:25 -04:00
Brad King 0ae7232334 Merge topic 'FindBLAS-target'
85a9813a76 BLAS: Provide the BLAS::BLAS import target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4657
2020-04-27 10:39:30 -04:00
Brad King dd62ee376e Tutorial: Restore MakeTable.cxx in step 6
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
2020-04-27 08:30:10 -04:00
Brad King 0315d269c2 Help: Reference policy CMP0082 from install() command docs
The policy plays an important role in the behavior of the `install()`
command, so the latter's documentation should mention it.
2020-04-27 07:45:11 -04:00
Vitaly Stakhovsky 4fd28b9911 cmOutputConverter::GetFortranFormat(): delete const char* overload 2020-04-27 07:38:47 -04:00
Kitware Robot c77353e11c CMake Nightly Date Stamp 2020-04-27 00:01:10 -04:00
Kitware Robot eadafe2ebc CMake Nightly Date Stamp 2020-04-26 00:01:20 -04:00
Kitware Robot a4071b53da CMake Nightly Date Stamp 2020-04-25 00:01:14 -04:00
Matthew Woehlke 671fe28313 ccmake: Improve coloring, allow customization
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
2020-04-24 11:21:13 -04:00
Marc Chevrier a7eca04163 FindPython: fix reason failure propagation 2020-04-24 15:47:05 +02:00
Matthew Woehlke f56a695440 ccmake: Rename cmCursesColor::{Options => Choice}
Rename the internal name for the color applied to multiple-choice
options to avoid use of the overloaded term 'option'.
2020-04-24 09:37:01 -04:00
Brad King 0b7efd7695 Merge branch 'release-3.17' 2020-04-24 08:36:17 -04:00
Brad King 360862f845 Merge topic 'FindPython-fix-python-compiler-validation'
f39da773ee FindPython: fix python compiler validation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4655
2020-04-24 08:36:17 -04:00
Brad King 63743bda0b Merge topic 'FindPython-fix-python-compiler-validation' into release-3.17
f39da773ee FindPython: fix python compiler validation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4655
2020-04-24 08:36:16 -04:00
Brad King 58cc649a30 Merge branch 'release-3.17' 2020-04-24 08:34:42 -04:00
Brad King 6713b29a1e Merge topic 'ninja-order-only-fix' into release-3.17
b45976fe10 Ninja: Remove config suffix from order-only target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4654
2020-04-24 08:34:42 -04:00
Brad King aaf0189cf0 Merge topic 'ninja-order-only-fix'
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
2020-04-24 08:34:42 -04:00
Brad King 2844ef87c6 Merge topic 'tutorial-remove-maketable'
c754a3d4b7 Tutorial: Remove MakeTable.cxx from Steps 5 and 6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4658
2020-04-24 08:33:05 -04:00