mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,867 Commits 2 Branches 401 Tags
faf635df0eadf891a9316e1bb3022c2bc1a4ae76
Commit Graph

47867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King faf635df0e Merge branch 'release-3.17' 2020-04-27 10:41:21 -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 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 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
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
Brad King 8c00f5ef0a Merge topic 'apple-merge-same-sysroot' into release-3.17 
3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4647
 2020-04-22 08:32:02 -04:00
Brad King 60831cfb22 Merge branch 'release-3.17' 2020-04-22 08:32:02 -04:00
Brad King 5a57cec2f4 Merge topic 'apple-merge-same-sysroot' 
3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4647
 2020-04-22 08:32:02 -04:00
Brad King c4ccf23186 Merge topic 'cpack-symlinks' into release-3.17 
bcc5cd44ed CPack: Do not recurse through directory symlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4637
 2020-04-22 08:30:53 -04:00
Brad King a9ea232e46 Merge branch 'release-3.17' 2020-04-22 08:30:53 -04:00
Brad King fb5d24fa3c Merge topic 'cpack-symlinks' 
bcc5cd44ed CPack: Do not recurse through directory symlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4637
 2020-04-22 08:30:53 -04:00
Brad King e01990999a Ninja: On Windows, select the compiler occurring first in PATH 
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
 2020-04-22 08:03:16 -04:00
Kitware Robot 8a8ebcdd70 CMake Nightly Date Stamp 2020-04-22 00:01:17 -04:00
Ben Boeckel ad4487a96a cmIncludeCommand: add infrastructure for deprecated modules 2020-04-21 11:27:27 -04:00
Gregor Jasny 3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same 
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.
 2020-04-21 11:18:12 -04:00
Brad King a583360d10 Merge topic 'external-project-mkdir-step-fix' 
e5b33871ed ExternalProject: Fix step dependency on mkdir step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4640
 2020-04-21 08:21:46 -04:00
Brad King a0cf159b9b Merge topic 'FindMPI-msmpi-env' 
faa0c62106 FindMPI: Normalize paths from MSMPI environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4644
 2020-04-21 08:20:48 -04:00
Brad King d56c96e967 Merge topic 'test-vtk' 
cc56bf89d9 Tests/Contracts: Update VTK release branch build configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4638
 2020-04-21 08:19:45 -04:00
Brad King 9ebf3a62b6 Merge topic 'refactor_cmCacheManager' 
80d8b20351 cmCacheManager: Cleanup CacheIterator interface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4628
 2020-04-21 08:18:47 -04:00