summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.18.3v3.18.3Brad King2020-09-221-1/+1
|
* Merge topic 'check-compiler-flag-result' into release-3.18Brad King2020-09-222-2/+0
|\ | | | | | | | | | | | | | | | | d4390c13e9 Merge branch 'backport-3.17-check-compiler-flag-result' d46590910c Check*CompilerFlag: Do not set result as a normal variable too Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Grund <github@grundis.de> Merge-request: !5250
| * Merge branch 'backport-3.17-check-compiler-flag-result'Brad King2020-09-212-2/+0
| |\ |/ /
| * Check*CompilerFlag: Do not set result as a normal variable tooBrad King2020-09-212-2/+0
| | | | | | | | | | | | | | | | | | Refactoring in commit cb984c6627 (Check*CompilerFlag: Modernize modules, 2019-12-09, v3.17.0-rc1~320^2) accidentally left the result set as a normal variable in addition to as a cache entry. This is not specified by the documentation, and is not the behavior in CMake 3.16 and below. Fixes: #21207
* | Merge topic 'foreach-int-parse-range-check' into release-3.18Brad King2020-09-215-0/+15
|\ \ | | | | | | | | | | | | | | | | | | 0412b55b83 foreach: Fix crash parsing integer out of range Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5239
| * | foreach: Fix crash parsing integer out of rangeBen McMorran2020-09-185-0/+15
| | |
* | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-186-7/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5238
| * | | Ninja Multi-Config: Fix dependencies of custom commandsKyle Edwards2020-09-176-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fd3a10 addressed the scenario where the depending target is a utility target, but not the scenario where the dependent target is a utility target. Account for this scenario. Also add a Qt-specific test case. Fixes: #21118
* | | | Merge topic 'FindMatlab-r2020b' into release-3.18Brad King2020-09-181-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 4d292aecb6 FindMatlab: add R2020b => 9.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5233
| * | | FindMatlab: add R2020b => 9.9Michael Hirsch2020-09-171-0/+1
| |/ /
* | | Merge topic 'ci-xcode-11.7' into release-3.18Brad King2020-09-171-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5236
| * | gitlab-ci: update macOS jobs to use Xcode 11.7Brad King2020-09-171-3/+3
|/ /
* | Help: Update 3.18.2 release notes to mention 3.16.9 and 3.17.5Brad King2020-09-151-0/+1
| | | | | | | | | | A change made in 3.18.2 was backported to the 3.16 and 3.17 branches. Update the 3.18 release note to mention them.
* | Merge branch 'release-3.17' into release-3.18Brad King2020-09-151-0/+9
|\ \ | |/
| * CMake 3.17.5v3.17.5Brad King2020-09-151-1/+1
| |
| * Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17Brad King2020-09-151-0/+9
| |\
| | * Help: Add 3.17.5 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-0/+9
| | |
| | * Merge branch 'backport-3.16-automoc-path-prefix-off'Brad King2020-09-151-5/+11
| | |\
| * | \ Merge branch 'release-3.16' into release-3.17Brad King2020-09-151-5/+11
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'backport-3.17-automoc-depend-project-file' into release-3.17Brad King2020-08-319-1/+150
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5166
* | \ \ \ Merge branch 'release-3.16' into release-3.18Brad King2020-09-151-5/+11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | CMake 3.16.9v3.16.9Brad King2020-09-151-1/+1
| | | | |
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-09-151-5/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Help: Add 3.16.9 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-5/+11
| | | | |
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-08-104-5/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | Merge-request: !5105
| * | | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16Brad King2020-08-071-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5108
* | \ \ \ \ Merge topic 'armclang-fixes' into release-3.18Brad King2020-09-111-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d1ed986e2 ARMClang: Fix link line generation after addition of armlink support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Osama Moharam <osama.moharam.uw@renesas.com> Merge-request: !5211
| * | | | | | ARMClang: Fix link line generation after addition of armlink supportMarc Chevrier2020-09-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise logic added by commit 73fb6ac82b (ARMClang: Add support for armlink, 2020-06-02, v3.18.0-rc1~27^2). Fixes: #21154
* | | | | | | Merge topic 'file-GENERATE-earlier' into release-3.18Brad King2020-09-111-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aee2c51224 file(GENERATE): Create output file structures for all directories first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5209
| * | | | | | file(GENERATE): Create output file structures for all directories firstJosef Angstenberger2020-09-101-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 36ded610af (PCH: Generate sources during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup is done earlier than before. Its parent commit f1fb63b306 (file(GENERATE): Create output file structures even earlier, 2019-10-07, v3.16.0-rc1~2^2~1) prepared for that. However, that commit did not account for generating and using files in separate subdirectories. Fix this by evaluating all generated files before adding automatic files. Fixes: #21144
* | | | | | Merge topic 'gitlab-ci-prefer-mr' into release-3.18Brad King2020-09-101-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6a80ffd54 gitlab-ci: Prefer MR rules for any pipeline associated with a MR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5214
| * | | | | | gitlab-ci: Prefer MR rules for any pipeline associated with a MRBrad King2020-09-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab 13.3 started creating MR pipelines in the parent project of a MR from a fork, at least when the MR submitter is a developer in the parent project. If the pipeline is associated with a MR, we should use the corresponding rules regardless of which project hosts the pipeline.
* | | | | | | Merge topic 'automoc-rerun-missing-dependency' into release-3.18Brad King2020-09-109-7/+132
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac3503d30 AutoMoc: Re-run moc if a dependency is missing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5180
| * | | | | | | AutoMoc: Re-run moc if a dependency is missingJoerg Bornemann2020-09-099-7/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoMoc uses the moc-emitted dependency file of Qt 5.15 to track dependencies. Such a dependency may well live outside the project and can vanish, for example when installing a new compiler version. This situation was detected before, but merely a warning was issued. Now, we're considering a generated file as out of date if a dependency is missing and re-generate it. We also have to remove the missing dependency from the ParseCache. Otherwise the AUTOMOC target for all generators other than Ninja will always be out of date. The ParseCacheChanged flag had to be made atomic, because we're potentially accessing it from multiple threads. The dependencies vector itself is not vulnerable in this regard, because there's one vector per file, and we're accessing exactly one ParseCacheT::FileHandleT per thread. Fixes: #21136
* | | | | | | | Merge topic 'pch-tv90' into release-3.18Brad King2020-09-091-8/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce7c100545 PCH: Fix 30s wait for VS2008 when used via -Tv90 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5199
| * | | | | | | | PCH: Fix 30s wait for VS2008 when used via -Tv90Cristian Adam2020-09-071-8/+20
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21142 Backport: release
* | | | | | | | Merge topic 'ios-pch-x-lang-header' into release-3.18Brad King2020-09-094-4/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d61294c3e PCH: Mark CMake PCH source files as -x <lang>-header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5188
| * | | | | | | | PCH: Mark CMake PCH source files as -x <lang>-headerCristian Adam2020-09-044-4/+19
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21163
* | | | | | | | Merge topic 'FindPython-set-CMP0012-NEW' into release-3.18Brad King2020-09-081-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0670797d71 FindPython: CMP0012 must be set to NEW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5198
| * | | | | | | FindPython: CMP0012 must be set to NEWMarc Chevrier2020-09-071-1/+11
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #21168
* | | | | | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-039-5/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fd3a107d Ninja Multi-Config: Fix dependencies of utility targets f1199bdc96 Ninja Multi-Config: Fix cleaning of utility targets with commands 657047cd24 Ninja Multi-Config: Fix clean:all target c35d1927a5 Tests: Pass additional Qt information to Ninja and NMC tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5177
| * | | | | | | Ninja Multi-Config: Fix dependencies of utility targetsKyle Edwards2020-09-026-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21118
| * | | | | | | Ninja Multi-Config: Fix cleaning of utility targets with commandsKyle Edwards2020-09-021-0/+2
| | | | | | | |
| * | | | | | | Ninja Multi-Config: Fix clean:all targetKyle Edwards2020-09-021-0/+1
| | | | | | | |
| * | | | | | | Tests: Pass additional Qt information to Ninja and NMC testsKyle Edwards2020-09-013-3/+4
| | | | | | | |
* | | | | | | | Merge topic 'FindPython-include-dir-ABI-checks' into release-3.18Brad King2020-09-031-8/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fdfe2428d FindPython: enhance ABI checks against include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5181
| * | | | | | | FindPython: enhance ABI checks against include directoryMarc Chevrier2020-09-021-8/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #21149
* | | | | | | Merge topic 'automoc-depend-project-file' into release-3.18Brad King2020-09-019-1/+150
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 776059ef0f Merge branch 'backport-3.17-automoc-depend-project-file' 6b20bbd2dd AutoMoc: Restore support for re-running after project file changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5166
| * \ \ \ \ \ \ Merge branch 'backport-3.17-automoc-depend-project-file'Brad King2020-08-319-1/+150
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | AutoMoc: Restore support for re-running after project file changesJoerg Bornemann2020-08-319-1/+150
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Qt >= 5.15.0 and Ninja generators AutoMoc creates a depfile to let Ninja decide when to run AutoMoc. This was introduced by commit aebfbcaa46 (AutoGen: Use depfiles for the XXX_autogen ninja targets, 2020-01-14, v3.17.0-rc1~58^2). However, AutoMoc was not triggered after adding a new moc-able file to the project. This patch adds the project file (and potentially included files) to the dependencies in the depfile. Now, a re-run of AutoMoc is triggered if the project file changes. Fixes: #21127
generated by cgit v0.12 at 2024-12-26 17:30:58 (GMT)