mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-18 22:08:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,881 Commits 2 Branches 401 Tags
9062bb676fb0d5f613f010719c88a8ca18f802df
Commit Graph

47881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 9062bb676f Merge branch 'release-3.17' 2020-04-28 07:10:08 -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 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 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 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
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
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
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
Brad King 29ea920540 Merge topic 'tutorial-step5-clarify' 
d0797f62d9 Tutorial: Clarify Step 5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4656
 2020-04-24 08:32:13 -04:00
Kitware Robot df69835a79 CMake Nightly Date Stamp 2020-04-24 00:01:12 -04:00
Robert Maynard 85a9813a76 BLAS: Provide the BLAS::BLAS import target 2020-04-23 13:59:33 -04:00
Kyle Edwards d837f8b6fb Merge branch 'master' into ninja-order-only-fix 2020-04-23 12:47:22 -04:00
Kyle Edwards b45976fe10 Ninja: Remove config suffix from order-only target 
Fixes: #20621
 2020-04-23 12:46:58 -04:00
Betsy McPhail c754a3d4b7 Tutorial: Remove MakeTable.cxx from Steps 5 and 6 
This file is not referenced until Step 6 and, therefore, should be added to
the source code at Step 7.

Fixes: #20618
 2020-04-23 11:57:34 -04:00
Marc Chevrier f39da773ee FindPython: fix python compiler validation 
Ensure also the cache of properties is erased in case of multiple
searches.

Fixes: #20626, #20627
 2020-04-23 17:47:22 +02:00
Betsy McPhail d0797f62d9 Tutorial: Clarify Step 5 
Fixes: #20619
 2020-04-23 11:47:20 -04:00
Brad King 61ac8e6dfa Merge topic 'remove-documentation-module' 
306a1ba960 Modules/Documentation: remove
ad4487a96a cmIncludeCommand: add infrastructure for deprecated modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4617
 2020-04-23 09:15:24 -04:00
Brad King b779cb13b4 Merge topic 'ninja-compiler-PATH-windows' 
e01990999a Ninja: On Windows, select the compiler occurring first in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4625
 2020-04-23 09:13:56 -04:00
Craig Scott d2ab8c5226 Merge topic 'doc_separate_arguments_typo' 
c6872432e6 Help: Fixed typo in command/separate_arguments.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4651
 2020-04-23 07:08:01 -04:00
Kitware Robot becf3b237e CMake Nightly Date Stamp 2020-04-23 00:01:11 -04:00
Jaak Ristioja c6872432e6 Help: Fixed typo in command/separate_arguments.rst 2020-04-22 23:21:51 +03:00
Ben Boeckel 306a1ba960 Modules/Documentation: remove 
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
 2020-04-22 10:46:03 -04:00
Brad King d9eb9e785e Merge topic 'win-user-manifest-rc' 
7ca13e04fa Windows: Merge user-provided manifests into compiled resource

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4484
 2020-04-22 09:15:59 -04:00
Brad King f9fbc78cd6 Merge topic 'ctest_stop_on_failure_16628' 
e89aeba5c4 ctest: add option --stop-on-failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4630
 2020-04-22 08:38:33 -04:00
Brad King 370def7b3e Merge topic 'FindSquish-windows' 
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
 2020-04-22 08:34:24 -04:00
Brad King acecd76f03 Merge topic 'update-kwsys' 
8191d39119 Merge branch 'upstream-KWSys' into update-kwsys
e833e660ef KWSys 2020-04-21 (44086372)

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