-
- Downloads
AutoMoc: Restore support for re-running after project file changes
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 aebfbcaa (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
Showing
- Source/cmQtAutoGenInitializer.cxx 1 addition, 0 deletionsSource/cmQtAutoGenInitializer.cxx
- Source/cmQtAutoMocUic.cxx 3 additions, 1 deletionSource/cmQtAutoMocUic.cxx
- Tests/QtAutogen/RerunMocOnAddFile/CMakeLists.txt 96 additions, 0 deletionsTests/QtAutogen/RerunMocOnAddFile/CMakeLists.txt
- Tests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/CMakeLists.txt.in 9 additions, 0 deletions...tAutogen/RerunMocOnAddFile/MocOnAddFile/CMakeLists.txt.in
- Tests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/anotherobject.cpp 15 additions, 0 deletions...tAutogen/RerunMocOnAddFile/MocOnAddFile/anotherobject.cpp
- Tests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/main.cpp.in 6 additions, 0 deletionsTests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/main.cpp.in
- Tests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/myobject.cpp 6 additions, 0 deletionsTests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/myobject.cpp
- Tests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/myobject.h 13 additions, 0 deletionsTests/QtAutogen/RerunMocOnAddFile/MocOnAddFile/myobject.h
- Tests/QtAutogen/Tests.cmake 1 addition, 0 deletionsTests/QtAutogen/Tests.cmake
Loading
Please register or sign in to comment