ENH: Improve Qt include path resolution macOS #271
Conversation
This file contains hidden or 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
Add specific framework path handling Refactor include directory parsing to support multiple candidate paths for headers and introduce macOS-specific logic for resolving framework-relative header paths. Enhance generator flexibility and robustness for cross-platform usage. Push upstream fix via: danmar/simplecpp#448
| @@ -217,7 +217,20 @@ namespace | |||
| QRegularExpression re("#define\\s+QTCORE_VERSION\\s+0x([0-9a-f]+)", QRegularExpression::CaseInsensitiveOption); | |||
| for (const QString &includeDir: getIncludeDirectories(commandLineIncludes)) | |||
| { | |||
| QFileInfo fi(QDir(includeDir), "qtcoreversion.h"); | |||
| std::list<std::string> candiate_paths; | |||
There was a problem hiding this comment.
typo: candidate_paths
Comment on lines
+43
to
+44
| std::string get_apple_framework_relative_path(const std::string& header); | ||
|
|
There was a problem hiding this comment.
Does this have to be public, or could you just put it into an anonymous namespace in the implementation?
| @@ -3116,13 +3116,40 @@ static std::string getIncludePathFileName(const std::string &includePath, const | |||
| return path + header; | |||
| } | |||
|
|
|||
| #ifdef __APPLE__ | |||
| static std::string get_apple_framework_relative_path(const std::string& header) | |||
There was a problem hiding this comment.
Please try to use the same naming style (e.g. camel case) as the rest of the code.
|
I am working with the upstream simplecpp developers to finalize the changes. danmar/simplecpp#448 I'll make fixes there. It will probably be a few months before I get back to this. |
|
Ah, I had missed that this is from an upstream change. In this case it is of course preferrable to leave the code compatible, though it would be even better if you could change this upstream, thanks! |
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.
Add specific framework path handling
Refactor include directory parsing to support multiple candidate paths for headers and introduce macOS-specific logic for resolving framework-relative header paths. Enhance generator flexibility and robustness for cross-platform usage.
Push upstream fix via:
danmar/simplecpp#448