cmake: add new macOS default location for QT discovery #8321
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
Codecov Report
@@ Coverage Diff @@
## develop #8321 +/- ##
===========================================
- Coverage 64.45% 64.41% -0.04%
===========================================
Files 339 339
Lines 43963 43963
===========================================
- Hits 28333 28317 -16
- Misses 15630 15646 +16
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
QT5 as offered by Homebrew is versioned since March 2021 and the default path points to QT6 (if installed). New installations of qt5 have a suffixed path (qt@5) that should be used instead.
droidmonkey
approved these changes
Sep 12, 2022
|
Removed the old entries since they are obsolete. I also added include_directories to force the use of the qt@5 include files. If you install Qt6 it will overwrite the system include files with Qt6 includes. |
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.
The build & install instructions for macOS say that using Homebrew to install the dependencies is enough and the build process will then work without additional setup.
However, QT5 as offered by Homebrew is versioned since March 2021 and the default, non-suffixed path points to QT6 (if installed). New installations of qt5/qt@5 have a suffixed path that should be used instead.
There's an explanation for using
-DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmakebut I'd argue this only applies to non-default setups and shouldn't be required for newly setup development environments.Technically I would think that removing the non-suffixed paths is feasible (and a good idea for better reproducibility) as well but I don't want to break existing setups. I suppose that's something to be done during #7774 ?
Screenshots
n/a
Testing strategy
Following the build & install instructions from a clean state.
Type of change