Commit Graph

53757 Commits

Author SHA1 Message Date
Ben Boeckel 4c757fa3c8 Help/prop_test/ENVIRONMENT: clarify the scope of the changes
The "restored" bit is an implementation detail as it could also be
implemented by passing a crafted environment to `execve` or
`CreateProcess` arguments. Instead, state that the environment changes
only affects the test with the property set.
2021-07-08 09:19:32 -04:00
Brad King 3736088310 Merge topic 'ctest_not_dart'
0962cbf21d help: update ctest attached file example
5489ce74b3 ctest: support <CTestMeasurement> for runtime measurements
7817aa6fa4 ctest: improve test for runtime labels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6296
2021-07-02 09:00:56 -04:00
Brad King c1346f67c8 Merge topic 'autogen-deps'
af11ea8d0c AutoGen: Fix needless compilation of mocs_compilation.cpp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6288
2021-07-02 08:59:40 -04:00
Brad King 05c2108229 Merge topic 'FindCUDATookit-ordering'
d930145841 FindCUDATookit: Fix ordering of libraries in imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6286
2021-07-02 08:10:23 -04:00
Brad King 5215605ce3 Merge branch 'release-3.21' 2021-07-02 08:06:55 -04:00
Brad King 52749ed81f Merge topic 'cmake-upload-junit-reports'
cb5c03ed04 gitlab-ci: upload JUnit reports for builds
722270ff50 ci: update to 3.21.0-rc2 for CI usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !6072
2021-07-02 08:06:54 -04:00
Brad King 6372e74ed4 Merge topic 'cmake-upload-junit-reports' into release-3.21
cb5c03ed04 gitlab-ci: upload JUnit reports for builds
722270ff50 ci: update to 3.21.0-rc2 for CI usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !6072
2021-07-02 08:06:54 -04:00
Brad King 828d857cb2 Merge branch 'release-3.21' 2021-07-02 08:05:53 -04:00
Brad King da48ee53ae Merge topic 'compiler-id-msvc-no-lib' into release-3.21
e93245ec64 DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6295
2021-07-02 08:05:53 -04:00
Brad King a660f996d8 Merge topic 'compiler-id-msvc-no-lib'
e93245ec64 DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6295
2021-07-02 08:05:53 -04:00
Brad King 6f93d2f713 Merge topic 'help_cstd' into release-3.21
9c310ff075 Help: Note C_STANDARD values added in CMake 3.21

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6294
2021-07-02 08:04:32 -04:00
Brad King 8a13a31fc4 Merge branch 'release-3.21' 2021-07-02 08:04:32 -04:00
Brad King c20ce7049c Merge topic 'help_cstd'
9c310ff075 Help: Note C_STANDARD values added in CMake 3.21

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6294
2021-07-02 08:04:32 -04:00
Brad King b908c4ae0f Merge topic 'ci-cuda9.2'
6b0b6efc75 gitlab-ci: add job testing cuda9.2 with Ninja Multi-Config
bf6965fbb8 ci: add cuda9.2 base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6292
2021-07-02 07:59:05 -04:00
Kitware Robot 4f69bf0964 CMake Nightly Date Stamp 2021-07-02 00:01:10 -04:00
Zack Galbreath 0962cbf21d help: update ctest attached file example
Clarify that multiple files can be attached to a given test at runtime
2021-07-01 15:16:29 -04:00
Zack Galbreath 5489ce74b3 ctest: support <CTestMeasurement> for runtime measurements
Teach CTest to parse output for <CTestMeasurement> in addition to
<DartMeasurement> for measurements defined at runtime.

Use a new class (cmCTestTestMeasurementXMLParser) derived from cmXMLParser
to parse the data and attributes these XML elements. This is an improvement
over our previous approach of using a series of regular expressions.

As part of this commit we also rename some member variables and methods
to make their purpose more clear.

DartStuff                        -> AllTestMeasurementsRegex
DartStuff1                       -> SingleTestMeasurementRegex
DartString                       -> TestMeasurementsOutput
GenerateDartOutput()             -> GenerateCTestXML()
GenerateRegressionImages()       -> RecordCustomTestMeasurements()
cmCTestRunTest::DartProcessing() -> ParseOutputForMeasurements()
2021-07-01 15:16:23 -04:00
Brad King e93245ec64 DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB
Update the change from commit c6aaaf066a (DetermineCompiler: Restore
identification of MSVC with no INCLUDE dirs, 2021-06-29,
v3.21.0-rc2~6^2) to also work with no `LIB` dirs.  Add the `-c` flag to
compile an object file without linking.
2021-07-01 13:04:16 -04:00
Dan Ibanez d930145841 FindCUDATookit: Fix ordering of libraries in imported targets
Before this a downstream code linking to `CUDA::cusparse_static` and
`CUDA::curand_static` would get a link line with `libcusparse_static.a`,
then `libculibos.a`, then `libcurand_static.a`.  Use `IMPORTED_LOCATION`
to tell CMake about the proper dependency ordering where `libculibos.a`
comes last, because the other two libraries depend on `libculibos.a`.

Fixes: #22365
2021-07-01 12:18:27 -04:00
Michael Hirsch 9c310ff075 Help: Note C_STANDARD values added in CMake 3.21
Issue: #22366
2021-07-01 11:58:00 -04:00
Brad King 6b0b6efc75 gitlab-ci: add job testing cuda9.2 with Ninja Multi-Config 2021-07-01 11:47:02 -04:00
Brad King bf6965fbb8 ci: add cuda9.2 base image 2021-07-01 11:47:02 -04:00
Brad King bf6c956792 Merge topic 'findmpi-werror-static-fail'
8cce0ad32f FindMPI: Fix missing static warning in the mpi test source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6293
2021-07-01 11:32:09 -04:00
Brad King 635a252564 Merge topic 'env-init-configs'
ef56eefc9b cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by environment variable
e216b9bbd3 cmake: Allow CMAKE_BUILD_TYPE to be set by environment variable
6986a382a9 Help: Document when CMAKE_BUILD_TYPE and CMAKE_CONFIGURATION_TYPES are set
e96169a3ec Help: Cross-reference CMAKE_CONFIGURATION_TYPES from CMAKE_BUILD_TYPE
03bd9c4c10 cmMakefile: Add helper to initialize CMAKE_CONFIGURATION_TYPES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6291
2021-07-01 11:29:41 -04:00
Brad King a10ca7f667 Merge topic 'post-rel-dev'
2c209097b9 Configure CMake itself with policies through CMake 3.20
83a3db5631 export: Increase maximum policy version in exported files to 3.20
d76cb12905 Add deprecation warnings for policies CMP0088 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6290
2021-07-01 11:27:31 -04:00
Brad King 3a6cb03b6c Merge topic 'cpackdeb-md5sums-order'
a0d3494afa Tests: update MD5SUMS test to have several files
9028195a22 CPackDeb: sort package files before generating deb file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6287
2021-07-01 11:26:28 -04:00
Zack Galbreath 7817aa6fa4 ctest: improve test for runtime labels
Check for the whole expected output string rather than particular substrings.
This verifies that newlines are stripped for any <CTestLabel> lines found
in the test output.
2021-07-01 11:12:28 -04:00
Joerg Bornemann af11ea8d0c AutoGen: Fix needless compilation of mocs_compilation.cpp
For an AUTOMOC'ed target foo, when depfiles are used, there are the
following dependencies:

foo_autogen -> foo_autogen/timestamp
foo_autogen/mocs_compilation.cpp -> foo_autogen/timestamp

The first is used to trigger AUTOGEN.
The second erroneously triggers a recompilation of
mocs_compilation.cpp when any source file of target foo is touched.

Remove the latter dependency and replace it with an order-only
dependency from foo_autogen/mocs_compilation.cpp to
foo_autogen_timestamp_deps.

That is achieved by making mocs_compilation.cpp or its
per-configuration variants byproduct(s) of the timestamp file.

Fixes: #22338
2021-07-01 15:31:02 +02:00
Kitware Robot 5333ee1de4 CMake Nightly Date Stamp 2021-07-01 00:01:13 -04:00
Chuck Atkins 8cce0ad32f FindMPI: Fix missing static warning in the mpi test source 2021-06-30 16:51:06 -04:00
Ben Boeckel cb5c03ed04 gitlab-ci: upload JUnit reports for builds
GitLab can render test results which come from JUnit files and inform
which tests have started failing on an MR.
2021-06-30 11:56:05 -04:00
Ben Boeckel 722270ff50 ci: update to 3.21.0-rc2 for CI usage
This version includes JUnit support in CTest.
2021-06-30 11:56:05 -04:00
Brad King ef56eefc9b cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by environment variable
When no `CMAKE_CONFIGURATION_TYPES` is explicitly specified while
creating a new build tree, check for an environment variable of the same
name.

Issue: #20983
2021-06-30 10:55:40 -04:00
Brad King e216b9bbd3 cmake: Allow CMAKE_BUILD_TYPE to be set by environment variable
When no `CMAKE_BUILD_TYPE` is explicitly specified while creating a new
build tree, check for an environment variable of the same name.

Issue: #20983
2021-06-30 10:55:40 -04:00
Brad King 6986a382a9 Help: Document when CMAKE_BUILD_TYPE and CMAKE_CONFIGURATION_TYPES are set
Fixes: #19247
2021-06-30 10:55:40 -04:00
Brad King e96169a3ec Help: Cross-reference CMAKE_CONFIGURATION_TYPES from CMAKE_BUILD_TYPE
The other direction is already linked.
2021-06-30 10:55:40 -04:00
Brad King 03bd9c4c10 cmMakefile: Add helper to initialize CMAKE_CONFIGURATION_TYPES
Factor out duplicate code from the Ninja Multi-Config, Visual Studio,
and Xcode generators.
2021-06-30 10:55:40 -04:00
Brad King 2c209097b9 Configure CMake itself with policies through CMake 3.20 2021-06-30 10:13:56 -04:00
Brad King 83a3db5631 export: Increase maximum policy version in exported files to 3.20
The files generatd by `install(EXPORT)` and `export()` commands
are known to work with policies as of CMake 3.20, so enable them
in sufficiently new CMake versions.
2021-06-30 10:13:56 -04:00
Brad King 88fade3914 Merge branch 'release-3.21' 2021-06-30 10:12:44 -04:00
Brad King 9473390ddc Merge topic 'doc-vs-fortran'
ab06f78182 Help: Document VS generator support for Intel Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6289
2021-06-30 10:12:44 -04:00
Brad King 07cae3c50a Merge topic 'doc-vs-fortran' into release-3.21
ab06f78182 Help: Document VS generator support for Intel Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6289
2021-06-30 10:12:43 -04:00
Brad King d76cb12905 Add deprecation warnings for policies CMP0088 and below
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for policies
introduced in CMake 3.14 and below to encourage projects to port
away from setting policies to OLD.
2021-06-30 10:07:42 -04:00
Brad King ab06f78182 Help: Document VS generator support for Intel Fortran
Extend the list of project types added by commit a82eb539f0 (Help:
Describe the type of Visual Studio projects that can be generated,
2018-08-04, v3.13.0-rc1~227^2) to mention that Fortran projects are
supported with Intel compiler integration.
2021-06-30 09:31:55 -04:00
Alexey Rogachevskiy a0d3494afa Tests: update MD5SUMS test to have several files
The test is now updated to check the order of files
in the md5sums.
2021-06-30 09:05:28 -04:00
Brad King 1a2c8407a7 Merge branch 'release-3.21' 2021-06-30 08:58:36 -04:00
Alexey Rogachevskiy 9028195a22 CPackDeb: sort package files before generating deb file
This should make the order in which the files are added to md5sums
and archives is stable, thus making package files more reproducible.

Fixes: #22361
2021-06-30 08:47:59 -04:00
Brad King e610e99ad3 CMake 3.21.0-rc2 v3.21.0-rc2 2021-06-30 07:51:35 -04:00
Brad King 6c3ae9827f Merge topic 'ninja-edit_cache'
51bf4094fb Ninja: Use `ccmake` for `edit_cache`
7cb4ad7e39 cmGlobalCommonGenerator: Adopt GetEditCacheCommand
23af78bb78 cmGlobalCommonGenerator: Adopt GetEditCacheTargetName
1db4d74628 cmGlobalCommonGenerator: Add SupportsDirectConsole
61a737b088 cmGlobalNinjaGenerator: Rename SupportsConsolePool to SupportsDirectConsole

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6272
2021-06-30 07:33:59 -04:00
Brad King 943d476346 Merge branch 'release-3.21' 2021-06-30 07:32:57 -04:00