summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Help: Document JSON comment support in cmake-presets(7)"Kyle Edwards2021-02-241-4/+1
| | | | | | Revert commit 8f1e607ed9 (Help: Document JSON comment support in cmake-presets(7), 2021-02-18). The support for comments was a mistake when the feature was implemented in 3.19, and is being removed.
* Merge topic 'ci-macos-arm64' into release-3.20Brad King2021-02-239-89/+146
|\ | | | | | | | | | | | | | | | | | | | | | | 397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode 0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64 73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin cab41b96ac ci: update to sccache 0.2.15 on linux builds 8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5851
| * gitlab-ci: Add macos-arm64 jobs for Ninja and XcodeBrad King2021-02-234-0/+72
| | | | | | | | For now, leave these jobs out during merge requests.
| * gitlab-ci: rename macos build and test jobs to macos-x86_64Brad King2021-02-235-32/+32
| | | | | | | | | | This makes room for future equivalents for other architectures. The packaging jobs produce universal binaries, so leave them as-is.
| * ci: add sccache 0.2.15 custom build for aarch64-apple-darwinBrad King2021-02-231-0/+7
| | | | | | | | Our custom build includes a patch to avoid server startup timeouts.
| * ci: update to sccache 0.2.15 on linux buildsBrad King2021-02-231-5/+5
| | | | | | | | | | | | The upstream release includes binaries for the architectures we need. However, the binaries do not have execute permission in their tarballs, so add it explicitly.
| * ci: Use Qt macOS 10.13+ package for macOS build and test jobsBrad King2021-02-231-52/+30
|/ | | | It is a universal binary for both `x86_64` and `arm64` architectures.
* Merge topic 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD' into release-3.20Brad King2021-02-231-2/+2
|\ | | | | | | | | | | | | 74fe16a292 Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystems Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5838
| * Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystemsDaan De Meyer2021-02-221-2/+2
| | | | | | | | | | | | | | | | | | Following commit 7155e358c9 (ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option, 2020-12-16, v3.20.0-rc1~168^2), modify the CONFIGURE_HANDLED_BY_BUILD test to sleep 1.125 seconds to make sure the file timestamp is always updated regardless of the resolution of the underlying filesystem. Fixes: #21830
* | Merge topic 'test-macos-arm64' into release-3.20Brad King2021-02-2311-19/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c15eb39d2 Tests: Suppress failures on macOS arm64 due to separate Xcode signing phase 92418ac0ef Tests: Fix CTestTestCrash expected output on macOS arm64 8b22d9b3c3 Tests: Remove explicit no-signing marks from BundleTest 483db3de56 Tests: Clarify internal project name in RunCMake.GoogleTest cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5846
| * | Tests: Suppress failures on macOS arm64 due to separate Xcode signing phaseBrad King2021-02-228-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests fail because Xcode runs `POST_BUILD` commands before signing the binaries they run. Tell the linker to perform ad-hoc codesign even though Xcode normally tells it not to. Other tests fail because `install_name_tool` does not revise ad-hoc signatures without the codesign `linker-signed` flag. Add that flag ourselves where needed by our tests. For now these changes help our test suite pass so we can use it to cover everything else. Both of these cases may need further investigation to update CMake to help projects in general. Issue: #21845, #21854
| * | Tests: Fix CTestTestCrash expected output on macOS arm64Brad King2021-02-221-1/+1
| | |
| * | Tests: Remove explicit no-signing marks from BundleTestBrad King2021-02-223-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | These were added by commit e29a92f525 (Xcode: Make BundleTests compatible with Xcode 11, 2019-09-01, v3.16.0-rc1~158^2). The real problem is that the `.app` is constructed with text files under the `.app/Contents/MacOS/` folder. Move those, and drop the special no-signing configuration.
| * | Tests: Clarify internal project name in RunCMake.GoogleTest casesBrad King2021-02-224-4/+4
| | |
* | | Merge topic 'cmake-gui-restore-search' into release-3.20Brad King2021-02-232-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 134d69121e cmake-gui: Restore search bar for cache view and environment dialog Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5845
| * | | cmake-gui: Restore search bar for cache view and environment dialogSankhesh Jhaveri2021-02-222-0/+10
| |/ / | | | | | | | | | | | | | | | | | | This was broken by commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7). Fixes: #21850
* | | Merge topic 'nag-fortran-include-moddir' into release-3.20Brad King2021-02-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ec030877a2 NAG: Fix using Fortran modules from their output directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5842
| * | | NAG: Fix using Fortran modules from their output directoryBrad King2021-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NAG Fortran compiler's `-mdir` flag sets the module output directory but does not add the directory to the search path for using modules. This is inconsistent with other compilers like the GNU Fortran compiler's `-J` flag that does both. In order to make these consistent, add the module output directory with a `-I` flag on the NAG Fortran compiler so that it will be searched when using modules too. We already do this for the XL Fortran compiler since commit 210b0b99a9 (XL: Fix using Fortran modules from their output directory, 2020-02-28, v3.18.0-rc1~640^2~1).
* | | | 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
| |/ / / /
generated by cgit v0.12 at 2025-01-15 15:38:14 (GMT)