summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'per-config-autogen-info-file' into release-3.20Brad King2021-02-232-4/+4
|\ | | | | | | | | | | | | a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5840
| * Autogen: Don't change the order of HEADERS array in AutogenInfo.jsonCraig Scott2021-02-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5 (Autogen: Add support for per-config sources, 2020-10-20), the ordering of the HEADERS array elements was changed and this broke their cmake_automoc_parser. We don't need to change the order of the array elements, we can append to the existing ones instead. Do this to allow their cmake_automoc_parser to continue to work. Fixes: #21823
* | Merge topic 'fix-IS_NEWER_THAN-usage' into release-3.20Brad King2021-02-228-6/+111
|\ \ | | | | | | | | | | | | | | | | | | | | | b0da671243 FetchContent: Don't update timestamps if files don't change 404cddb7bb ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5825
| * | FetchContent: Don't update timestamps if files don't changeCraig Scott2021-02-226-4/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring in 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) uses a different way of writing out the step scripts and updating time stamps when steps are executed. That inadvertently always wrote out the scripts for custom commands, even when the contents didn't change. This caused their timestamp to always be updated, resulting in those steps always being seen as out-of-date and needing to be re-executed. The way timestamps were checked to determine whether to re-execute a step also did not adequately account for file systems which only have second-resolution timestamps. The IS_NEWER_THAN if condition also returns true when timestamps are the same, so one needs to use the negative form to get a true "is newer than" test. ExternalProject is not susceptible to this problem because it uses file(GENERATE) to write out the script files and that only updates the file's timestamp if the contents change. It also mostly leaves timestamp checking to the build tool.
| * | ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checksCraig Scott2021-02-222-2/+4
| | | | | | | | | | | | | | | | | | | | | When using a file system which only has second resolution timestamps, there is a reasonably high likelihood of timestamps being the same. The IS_NEWER_THAN test returns true when timestamps are the same, so don't redo downloads when they match exactly.
* | | Merge topic 'vs-pch-one-lang' into release-3.20Brad King2021-02-226-7/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9945b3b565 VS: Restore support for PCH in CXX but not C within once target d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5836
| * | | VS: Restore support for PCH in CXX but not C within once targetBrad King2021-02-196-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic from commit 9df1f33c9a (VisualStudio: move PCH rules to projects when possible., 2020-10-15, v3.20.0-rc1~638^2) to explicitly disable PCH on sources that should not use the target-wide PCH rules. Fixes: #21827
| * | | cmVisualStudio10TargetGenerator: Refactor per-source PCH logicBrad King2021-02-191-6/+6
| | |/ | |/| | | | | | | De-duplicate the link language lookup.
* | | Merge topic 'cpackifw-scanbuild-fix' into release-3.20Brad King2021-02-221-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5832
| * | | CPackIFWInstaller: Avoid potential null pointer dereferenceCraig Scott2021-02-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In d16830324f (CPackIFW: Improve warning and docs for show page list option, 2021-02-14), code was added to report the current QtIFW version. That code didn't check that there was a Generator object before using it, resulting in a scanbuild warning about a potential null pointer dereference. Add a check and output a more general warning message if we don't have the current QtIFW version available to report.
* | | | Merge topic 'doc-cpack-dpkg-shlibdeps-l' into release-3.20Brad King2021-02-221-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | cf9a71870b Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5835
| * | | Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentationBrad King2021-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs added by commit d586a4ad60 (CPackDeb: dpkg-shlibdeps now supports searching for private shared libs, 2021-01-19, v3.20.0-rc1~115^2) specify the `-d` option, but the implementation actually uses the `-l` option. Issue: #21838
* | | | Merge branch 'release-3.19' into release-3.20Brad King2021-02-190-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-intel-fortran-preprocess' into release-3.19Brad King2021-02-181-2/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5826
* | \ \ \ \ Merge topic 'intel-fortran-preprocess' into release-3.20Brad King2021-02-192-4/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9244f369a IntelLLVM: Make explicit Fortran preprocessing under Ninja more robust 056d4bf528 Merge branch 'backport-intel-fortran-preprocess' af074c266e Intel: Make explicit Fortran preprocessing under Ninja more robust Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5826
| * | | | | | IntelLLVM: Make explicit Fortran preprocessing under Ninja more robustBrad King2021-02-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell the Fortran compiler to write preprocessor output directly to a file, as we do for the GNU compiler. The previous "redirect stdout" approach could break during ABI detection with some `mpif90` wrappers that add version information to stdout when called with `-v`. Issue: #21828
| * | | | | | Merge branch 'backport-intel-fortran-preprocess'Brad King2021-02-181-2/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | Intel: Make explicit Fortran preprocessing under Ninja more robustBrad King2021-02-181-2/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell the Fortran compiler to write preprocessor output directly to a file, as we do for the GNU compiler. The previous "redirect stdout" approach could break during ABI detection with some `mpif90` wrappers that add version information to stdout when called with `-v`. Fixes: #21828
* | | | | Merge topic 'docpreset' into release-3.20Brad King2021-02-192-10/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87b170d9f9 Help: Add build and test preset to examples in cmake-presets(7) 3f8cf006cb Help: Clarify preset name conflict rules in cmake-presets(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5823
| * | | | | Help: Add build and test preset to examples in cmake-presets(7)Michael Hirsch2021-02-181-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Co-Author: Brad King <brad.king@kitware.com>
| * | | | | Help: Clarify preset name conflict rules in cmake-presets(7)Michael Hirsch2021-02-181-8/+9
| | | | | |
* | | | | | Merge topic 'llvm-nm-cleanup' into release-3.20Brad King2021-02-191-1/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e5077688 bindexplib: remove stray debugging output when using llvm-nm Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5828
| * | | | | bindexplib: remove stray debugging output when using llvm-nmBrad King2021-02-181-1/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Remove a debugging message left by commit c856d4556b (bindexplib: supporting llvm bitcode formats using llvm-nm, 2019-08-13, v3.16.0-rc1~161^2~1).
* | | | | Merge topic 'doc-if-links' into release-3.20Brad King2021-02-181-7/+51
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 22140f7af3 Help: Add internal links to if() docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5824
| * | | | Help: Add internal links to if() docsMichael Hirsch, Ph.D2021-02-181-7/+51
| |/ / /
* | | | Merge topic 'preset-json-comments' into release-3.20Brad King2021-02-181-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f1e607ed9 Help: Document JSON comment support in cmake-presets(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5830
| * | | | Help: Document JSON comment support in cmake-presets(7)Michael Hirsch2021-02-181-1/+4
| | | | |
* | | | | Merge topic 'doc-presets' into release-3.20Brad King2021-02-183-12/+21
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47ab2d4d2e Help: Clarify role of binaryDir inheritance in cmake-presets(7) 0e3c361f77 Help: Link to tool-specific preset arguments from cmake-presets(7) dd6165fbd4 Help: Mention version 2 in cmake-presets(7) cdbd1ae64b Utilities/Sphinx: Avoid converting -- to an en-dash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5829
| * | | | Help: Clarify role of binaryDir inheritance in cmake-presets(7)Brad King2021-02-181-4/+6
| | | | | | | | | | | | | | | | | | | | Suggested-by: Michael Hirsch
| * | | | Help: Link to tool-specific preset arguments from cmake-presets(7)Brad King2021-02-182-6/+9
| | | | | | | | | | | | | | | | | | | | Fixes: #21835
| * | | | Help: Mention version 2 in cmake-presets(7)Brad King2021-02-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 2 is required for build and test presets. Fixes: #21829
| * | | | Utilities/Sphinx: Avoid converting -- to an en-dashBrad King2021-02-181-0/+1
| |/ / /
* | | | Merge topic 'fix-intel-compiler-check' into release-3.20Brad King2021-02-181-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | dc7b6c2c06 DetermineCompiler: Fix copy-paste error in Intel Compiler detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5818
| * | | DetermineCompiler: Fix copy-paste error in Intel Compiler detectionGregor Jasny2021-02-171-1/+1
| |/ / | | | | | | | | | | | | Fixes: #21561 Fixes: a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02)
* | | Merge topic 'fetchcontent-patch-step-typo' into release-3.20Craig Scott2021-02-184-1/+26
|\ \ \ | |/ / |/| | | | | | | | | | | | | | bd876f3849 FetchContent: Restore patch command support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5822
| * | FetchContent: Restore patch command supportCraig Scott2021-02-174-1/+26
|/ / | | | | | | | | | | The refactoring in 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) contained a typo which resulted in any PATCH_COMMAND being ignored. Fix the typo and add a test case that would have caught the regression.
* | CMake 3.20.0-rc1v3.20.0-rc1Brad King2021-02-161-1/+1
| |
* | Merge branch 'release-3.19' into release-3.20Brad King2021-02-160-0/+0
|\ \ | |/
| * Merge branch 'FindPython-fix-variable-handling' into release-3.19Brad King2021-02-161-2/+2
| |\ | | | | | | | | | Merge-request: !5816
* | \ Merge topic 'FindPython-fix-variable-handling' into release-3.20Brad King2021-02-161-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 754f4f6876 FindPython: fix erroneous variable handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5816
| * | FindPython: fix erroneous variable handlingMarc Chevrier2021-02-161-2/+2
| |/ | | | | | | Fixes: #21817
* | Merge branch 'release-3.19' into release-3.20Brad King2021-02-160-0/+0
|\ \ | |/
| * CMake 3.19.5v3.19.5Brad King2021-02-151-1/+1
| |
* | Merge topic 'preset-fixes' into release-3.20Brad King2021-02-164-14/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 121d602923 presets: Inherit 'quiet' property for test presets 7fd6bb6895 presets: Remove unintended rerunFailed option from test presets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5808
| * | presets: Inherit 'quiet' property for test presetsSam Freed2021-02-151-0/+1
| | | | | | | | | | | | This was missed in the original implementation.
| * | presets: Remove unintended rerunFailed option from test presetsSam Freed2021-02-154-14/+0
| | | | | | | | | | | | | | | | | | | | | This was accidentally included after discussion in #21391 had decided to leave it out. It was never included in a release. Issue: #21391
* | | Merge topic 'FindPNG-advanced-variables' into release-3.20Brad King2021-02-161-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 17ae4e1bef FindPNG: only mark used variables as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5809
| * | | FindPNG: only mark used variables as advancedBen Boeckel2021-02-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The `PNG_LIBRARY` variable is an output and not a cache variable. Fixes some CMP0102 warnings.
* | | | Merge topic 'IntelLLVM-unused-C17' into release-3.20Brad King2021-02-161-8/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4642c81c72 IntelLLVM: Remove incomplete C17 support Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5805
| * | | IntelLLVM: Remove incomplete C17 supportBrad King2021-02-151-8/+3
| |/ / | | | | | | | | | | | | CMake does not yet model support for C17. Avoid possible confusion by removing the settings for IntelLLVM pending a full implementation.
generated by cgit v0.12 at 2025-03-12 19:18:42 (GMT)