[qt6] Add support for MACOSX_BUNDLE #24642
Merged
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
3 tasks
DoomHammer
approved these changes
Jul 16, 2024
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Uilian Ries <uilianries@gmail.com>
jcar87
force-pushed
the
qt6/missing-plist
branch
from
c317115
to
adf3e57
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
jcar87
reviewed
Jul 25, 2024
recipes/qt/6.x.x/conanfile.py
Outdated
| @@ -837,6 +839,8 @@ def package(self): | |||
| filecontents += f"set(QT_VERSION_MAJOR {ver.major})\n" | |||
| filecontents += f"set(QT_VERSION_MINOR {ver.minor})\n" | |||
| filecontents += f"set(QT_VERSION_PATCH {ver.patch})\n" | |||
| if self.settings.os == "Macos": | |||
| filecontents += f'set(__qt_internal_cmake_apple_support_files_path "{os.path.join(self.package_folder, "res", "macos")}")\n' | |||
There was a problem hiding this comment.
does this not cause a file inside package_folder to have a full, absolute path referencing a file that existed at package build time, but may not exist on a different computer? intuitively this should be a relative path?
There was a problem hiding this comment.
Agreed, it should be relative path. Absolute will break users for sure.
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit e19a3deqt/6.7.1@#01499e0b39e277ad24155decbb7791cbqt/5.15.14@#363b63b84714e9a9b3f108e8382468edqt/6.6.3@#30113cee42cf1ae31f805f7ae19a79f3qt/6.5.3@#25be311dd23e5cdcde10ac95b96e1cc8 |
|
Changed as draft to fix the cmake relative path when consuming the package. |
Signed-off-by: Uilian Ries <uilianries@gmail.com>
|
@jcar87 I changed the recipe use the relative path instead: 3f6b361 I tested locally using the follow patch for test package: The full build log is this one: |
Conan v1 pipeline ✔️All green in build 7 (
Conan v2 pipeline ✔️
All green in build 5 ( |
Hooks produced the following warnings for commit 3f6b361qt/5.15.14@#bc8373cc091c60c28bccd10d055a8ac1qt/6.7.1@#e613f59c8895e27caca9f42ffa05bda6qt/6.6.3@#d6ad1c1822d9de56fbf1ebccc6b3e4afqt/6.5.3@#b32599d5df35abba037b7b54f6c7a64e |
jcar87
approved these changes
Jul 29, 2024
perseoGI
approved these changes
Jul 29, 2024
3 tasks
3 tasks
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.
Summary
Changes to recipe: qt/6.7.1
Motivation
The Qt project exports more files and variables than CMakeDeps. The variable
__qt_internal_cmake_apple_support_files_pathis consumed to point whereInfo.plist.app.inshould be installed.Details
To validate the current change, I modified the test package to use
qt_add_executable(${PROJECT_NAME} MACOSX_BUNDLE test_package.cpp):Content of
Info.plist.app.inBuild test log:
fixes #20574
/cc @tamaskenezlego @DoomHammer