summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CTest: add an ENVIRONMENT_MODIFICATION propertyBen Boeckel2021-07-0924-3/+339
| | | | | | | | | | | | | | | | | | | | This property allows projects to modify environment variables at test time rather than trying to guess what the state should be based on what is present at configure time. Of particular interest is the ability to use a `PATH` present at test time while adding entries known to be necessary for the test itself. There are multiple operations provided to modify variables, including: - setting and unsetting - appending and prepending as: - strings - path lists - CMake lists Additionally, a `reset` action is provided to cancel any prior modifications to that particular variable in the case of incremental additions to the test property.
* Help/prop_test/ENVIRONMENT: clarify the scope of the changesBen Boeckel2021-07-081-2/+2
| | | | | | | 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.
* Merge topic 'ctest_not_dart'Brad King2021-07-0213-174/+175
|\ | | | | | | | | | | | | | | | | 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
| * help: update ctest attached file exampleZack Galbreath2021-07-011-2/+4
| | | | | | | | Clarify that multiple files can be attached to a given test at runtime
| * ctest: support <CTestMeasurement> for runtime measurementsZack Galbreath2021-07-0112-169/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()
| * ctest: improve test for runtime labelsZack Galbreath2021-07-011-5/+2
| | | | | | | | | | | | 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.
* | Merge topic 'autogen-deps'Brad King2021-07-021-5/+23
|\ \ | | | | | | | | | | | | | | | | | | af11ea8d0c AutoGen: Fix needless compilation of mocs_compilation.cpp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6288
| * | AutoGen: Fix needless compilation of mocs_compilation.cppJoerg Bornemann2021-07-011-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'FindCUDATookit-ordering'Brad King2021-07-021-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindCUDATookit: Fix ordering of libraries in imported targetsDan Ibanez2021-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'release-3.21'Brad King2021-07-020-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'cmake-upload-junit-reports' into release-3.21Brad King2021-07-026-9/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ Merge topic 'cmake-upload-junit-reports'Brad King2021-07-026-9/+30
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | gitlab-ci: upload JUnit reports for buildsBen Boeckel2021-06-304-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab can render test results which come from JUnit files and inform which tests have started failing on an MR.
| * | | | | ci: update to 3.21.0-rc2 for CI usageBen Boeckel2021-06-302-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | This version includes JUnit support in CTest.
* | | | | | Merge branch 'release-3.21'Brad King2021-07-020-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'compiler-id-msvc-no-lib' into release-3.21Brad King2021-07-022-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e93245ec64 DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6295
* | \ \ \ \ \ Merge topic 'compiler-id-msvc-no-lib'Brad King2021-07-022-2/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e93245ec64 DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6295
| * | | | | | DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIBBrad King2021-07-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'release-3.21'Brad King2021-07-020-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'help_cstd' into release-3.21Brad King2021-07-021-1/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c310ff075 Help: Note C_STANDARD values added in CMake 3.21 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6294
* | \ \ \ \ \ \ Merge topic 'help_cstd'Brad King2021-07-021-1/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c310ff075 Help: Note C_STANDARD values added in CMake 3.21 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6294
| * | | | | | | Help: Note C_STANDARD values added in CMake 3.21Michael Hirsch2021-07-011-1/+20
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Issue: #22366
* | | | | | | Merge topic 'ci-cuda9.2'Brad King2021-07-026-0/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | gitlab-ci: add job testing cuda9.2 with Ninja Multi-ConfigBrad King2021-07-014-0/+32
| | | | | | | |
| * | | | | | | ci: add cuda9.2 base imageBrad King2021-07-012-0/+19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-07-021-1/+1
| | | | | | |
* | | | | | | Merge topic 'findmpi-werror-static-fail'Brad King2021-07-011-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cce0ad32f FindMPI: Fix missing static warning in the mpi test source Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6293
| * | | | | | | FindMPI: Fix missing static warning in the mpi test sourceChuck Atkins2021-06-301-9/+9
| |/ / / / / /
* | | | | | | Merge topic 'env-init-configs'Brad King2021-07-0121-24/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by environment variableBrad King2021-06-3010-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | cmake: Allow CMAKE_BUILD_TYPE to be set by environment variableBrad King2021-06-3010-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Help: Document when CMAKE_BUILD_TYPE and CMAKE_CONFIGURATION_TYPES are setBrad King2021-06-302-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19247
| * | | | | | | Help: Cross-reference CMAKE_CONFIGURATION_TYPES from CMAKE_BUILD_TYPEBrad King2021-06-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The other direction is already linked.
| * | | | | | | cmMakefile: Add helper to initialize CMAKE_CONFIGURATION_TYPESBrad King2021-06-305-24/+18
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out duplicate code from the Ninja Multi-Config, Visual Studio, and Xcode generators.
* | | | | | | Merge topic 'post-rel-dev'Brad King2021-07-0110-9/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Configure CMake itself with policies through CMake 3.20Brad King2021-06-303-3/+3
| | | | | | | |
| * | | | | | | export: Increase maximum policy version in exported files to 3.20Brad King2021-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Add deprecation warnings for policies CMP0088 and belowBrad King2021-06-306-4/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'cpackdeb-md5sums-order'Brad King2021-07-014-2/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Tests: update MD5SUMS test to have several filesAlexey Rogachevskiy2021-06-303-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is now updated to check the order of files in the md5sums.
| * | | | | | | CPackDeb: sort package files before generating deb fileAlexey Rogachevskiy2021-06-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | CMake Nightly Date StampKitware Robot2021-07-011-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'doc-vs-fortran' into release-3.21Brad King2021-06-307-14/+21
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab06f78182 Help: Document VS generator support for Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6289
* | | | | | | Merge topic 'doc-vs-fortran'Brad King2021-06-307-14/+21
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | ab06f78182 Help: Document VS generator support for Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6289
| * | | | | Help: Document VS generator support for Intel FortranBrad King2021-06-307-14/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | CMake 3.21.0-rc2v3.21.0-rc2Brad King2021-06-301-1/+1
| | | | |
* | | | | Merge topic 'ninja-edit_cache'Brad King2021-06-308-48/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v0.12 at 2024-12-28 13:37:51 (GMT)