-
Notifications
You must be signed in to change notification settings - Fork 19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
1733 Auto Qt #1772
Merged
Merged
1733 Auto Qt #1772
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
trisyoungs
force-pushed
the
1733-auto-qt
branch
from
January 22, 2024 16:18
cf491b5
to
4ec3829
Compare
rprospero
approved these changes
Jan 30, 2024
trisyoungs
force-pushed
the
1733-auto-qt
branch
from
February 1, 2024 15:32
a63e240
to
26de7c2
Compare
@RobBuchananCompPhys are you OK with me merging this in now, since it will cause a conflict with your other charges PR #1787, or would you like me to wait? |
trisyoungs
force-pushed
the
1733-auto-qt
branch
from
February 10, 2024 22:23
9540367
to
079f5e9
Compare
rprospero
pushed a commit
that referenced
this pull request
Mar 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR started off as a quick "30 minutes left on a Friday" job, but has turned into a "waste the whole of Monday" task instead. This is a big PR, but most of it is just renaming and only the first and last commits are particularly interesting.
So to begin we were already using CMake's
AUTOMOC
option, but notAUTORCC
orAUTOUIC
, and were kind of half-blending the automated integration with theqt6_wrap_*
mechanism (not recommended). Switching out to full auto cleans up a lot of our filenames, removing the "custom"*.hui
and*Funcs.cpp
namings in favour of plain old*.h
and*.cpp
(the latter was a legacy introduced many years ago when I was getting clashes between Qt-generated*.cpp
files, from processingui
files, with my own).However, moving to full auto introduces a problem whereby now autogenerated files are stored in many separate locations, rather than in a single build dir), meaning
CMakeLists.txt
have had to be adjusted in a few places in order to find the necessaryui_*
files. This was a particular issue for themoduleWidgetProducer
target which needed to find Nui_*
files for N modules in N different locations. A solution is in place, but perhaps someone with a better relationship with CMake can implement a better one (see final commit).Closes #1733.