Commit Graph

47836 Commits

Author SHA1 Message Date
Kelly (KT) Thompson
40ca6ef125 CTestCoverageCollectGCOV: Add TARBALL_COMPRESSION option
For large projects, the default bzip2 compression of gcov data is
prohibitively expensively (could take several hours).  Introduce options
that allow the consumer to choose between file size and compression time.

Add a new optional argument `TARBALL_COMPRESSION` for the macro
`ctest_coverage_collect_gcov`. This option accepts the values `GZIP`,
`BZIP2`, `XZ`, `FROM_EXT`, or an expression that evaluates to `FALSE`.
The default value is `BZIP2` to preserve prior behavior.

Fixes: #20593
2020-04-30 08:42:00 -04:00
Brad King
81e83510a0 Tests: Fix re-running CTestCoverageCollectGCOV on in-source build
Do not remove the test binary directory if it contains `CMakeCache.txt`.
Otherwise in an in-source build we remove the source directory too.
2020-04-30 08:42:00 -04:00
Brad King
ab7eda2591 Tests: Remove unnecessary pass regex on CTestCoverageCollectGCOV
The test script uses `message(FATAL_ERROR)` on failure, so we
can just let the `ctest` exit code determine the result.
2020-04-29 09:19:06 -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
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
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
a9ea232e46 Merge branch 'release-3.17' 2020-04-22 08:30:53 -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
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
Kitware Robot
8a8ebcdd70 CMake Nightly Date Stamp 2020-04-22 00:01:17 -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
Brad King
22d2354ec5 Merge topic 'nasm-with-CXX'
3328e0a387 NASM: Fix object format when CXX is enabled but not C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4642
2020-04-21 08:17:43 -04:00
Brad King
cd957389f2 Merge topic 'findpython-remove-unneeded-guard'
c6ba196314 FindPython: remove unnecessary if check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4641
2020-04-21 08:16:39 -04:00
Brad King
dba914aa31 Merge topic 'ti-compilers-fix-cxx'
65c1320719 Compiler/TI: Fix C++ toolchain command-lines
4110d9dffb Compiler/TI: Fix linker command line for C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4627
2020-04-21 08:15:31 -04:00
Brad King
e608a6ef20 Merge topic 'update-kwiml'
7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml
bd202202ce KWIML 2020-04-20 (4abfeaa7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4639
2020-04-21 08:14:26 -04:00
Kenney Phillis
7ca13e04fa Windows: Merge user-provided manifests into compiled resource
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.
2020-04-21 08:10:45 -04:00
Brad King
c02d2a4b21 Merge branch 'release-3.17' 2020-04-21 07:44:32 -04:00
Brad King
4a5de69e09 Merge topic 'FindBoost-1.73' into release-3.17
9daf79c53b FindBoost: Add support for Boost 1.73
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f3e BoostScanDeps: Fix typo in numpy handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4635
2020-04-21 07:44:31 -04:00
Brad King
3465ae916f Merge topic 'FindBoost-1.73'
9daf79c53b FindBoost: Add support for Boost 1.73
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f3e BoostScanDeps: Fix typo in numpy handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4635
2020-04-21 07:44:31 -04:00
Brad King
bcc5cd44ed CPack: Do not recurse through directory symlinks
Extend the fix from commit 7b8dcdd173 (CPack: Do not recurse through
directory symlinks (#12284), 2011-08-27, v2.8.6~55^2) to more places in
CPack.

Issue: #12284
2020-04-21 07:28:06 -04:00
Brad King
8191d39119 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-21 (44086372)
2020-04-21 07:15:22 -04:00
KWSys Upstream
e833e660ef KWSys 2020-04-21 (44086372)
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
2020-04-21 07:15:21 -04:00
Kitware Robot
441a5f73c0 CMake Nightly Date Stamp 2020-04-21 00:01:15 -04:00
Johnny Jazeix
e89aeba5c4 ctest: add option --stop-on-failure
To stop the tests once one has failed

Fixes: #16628
2020-04-20 23:05:15 +02:00
Frederik Gladhorn
c77c92791c FindSquish: Fix setting the application under test
The AUT (application under test) was previously set by trying to extract the target location,
which is no longer supported.
2020-04-20 22:20:11 +02:00
Frederik Gladhorn
879b279154 FindSquish: Fix launching the Squish server process on Windows
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.
2020-04-20 22:20:11 +02:00
Brad King
faa0c62106 FindMPI: Normalize paths from MSMPI environment variables
Fixes: #20606
2020-04-20 13:39:06 -04:00
Vyacheslav Yurkov
e5b33871ed ExternalProject: Fix step dependency on mkdir step
When looking at `list(FIND)` result, zero index is ignored due to
incorrect error handling, and users can't set dependencies on mkdir
step.

Fixes: #20605
2020-04-20 18:49:17 +02:00
Brad King
cc56bf89d9 Tests/Contracts: Update VTK release branch build configuration
Configure our contract test to work with the VTK 9.0 branch.
2020-04-20 12:46:51 -04:00
Christian Feldmann
3328e0a387 NASM: Fix object format when CXX is enabled but not C
Check CXX data pointer size if C is not set.
2020-04-20 11:07:30 -04:00
Ben Boeckel
c6ba196314 FindPython: remove unnecessary if check
`list(REMOVE_DUPLICATES)` is safe on empty lists since 3.14.
2020-04-20 10:30:09 -04:00
Brad King
7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2020-04-20 (4abfeaa7)
2020-04-20 08:42:21 -04:00
KWIML Upstream
bd202202ce KWIML 2020-04-20 (4abfeaa7)
Code extracted from:

    https://gitlab.kitware.com/utils/kwiml.git

at commit 4abfeaa780c5107013f264c0517107b48b43bba4 (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      a079afc6 cmake: don't set the minimum version

Hernan Martinez (1):
      4abfeaa7 abi.h: Add pointer size and endianess for Windows on ARM64
2020-04-20 08:42:21 -04:00
Alexander Grund
9daf79c53b FindBoost: Add support for Boost 1.73
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.73.0
sources to compute dependencies.

This includes a new Boost.Nowide library.

Special case: Boost.Filesystem is an optional dependency as the include
is only required to make Boost.Filesystem use UTF-8 paths on user
request
2020-04-20 08:27:32 -04:00
Alexander Grund
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons 2020-04-20 08:27:32 -04:00
Alexander Grund
56b3375f3e BoostScanDeps: Fix typo in numpy handling
Fix a typo from commit e66e8e8914 (BoostScanDeps: Special case python
and numpy and variants, 2017-08-22, v3.10.0-rc1~229^2~1).
2020-04-20 08:27:31 -04:00
Brad King
5d32699975 Merge topic 'device-link'
4248bb452a CUDA: Device linking use now link options
ec48e023f6 CUDA: Add information for LINKER: pattern translation
3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK>
38332fc4fa cmGeneratorExpressionDAGChecker: introduce method Top()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4577
2020-04-20 08:14:16 -04:00
Brad King
a0a861b27f Merge topic 'FindPkgConfig-frameworks'
95ead38375 FindPkgConfig: fix handling of frameworks
b7304f35b3 Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3814
2020-04-20 08:09:57 -04:00
Brad King
ab61ee1b5b Merge topic 'update-kwsys'
b6ce851bef Merge branch 'upstream-KWSys' into update-kwsys
363ec4f585 KWSys 2020-04-17 (54845345)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4621
2020-04-20 08:03:55 -04:00
Brad King
be88264abe Merge topic 'ninja-fortran-doc' into release-3.17
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4626
2020-04-20 07:53:49 -04:00
Brad King
cd307fb303 Merge branch 'release-3.17' 2020-04-20 07:53:49 -04:00
Brad King
aae1efc7d2 Merge topic 'ninja-fortran-doc'
f2fa7d20b2 Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-doc
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4626
2020-04-20 07:53:49 -04:00