-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
[mathgl] Fix incorrect target name and incorrect executable path #28315
Conversation
This overlaps with #28311. |
PS: Test non-default feautures, CI won't do it for us. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I hope I won't be forced to rebase my PR on a revert of these changes.
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/MathGL2/MathGLTargets-debug.cmake" | ||
"${VCPKG_IMPORT_PREFIX}/debug/${PATH}/${TOOL_NAME}.exe" "${VCPKG_IMPORT_PREFIX}/tools/mathgl/${TOOL_NAME}.exe") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/MathGL2/MathGLTargets-release.cmake" | ||
"${VCPKG_IMPORT_PREFIX}/${PATH}/${TOOL_NAME}.exe" "${VCPKG_IMPORT_PREFIX}/tools/mathgl/${TOOL_NAME}.exe") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO this is not the right fix. Normally, this should be handled by vcpkg_cmake_config_fixup
. If it doesn't work, it might need a fix there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This action should be run before calling vcpkg_cmake_config_fixup
to avoid executable target path is changed.
And we should use vcpkg_copy_tools
since we should know which tools should be installed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I use vcpkg_copy_tools
to handle tools before calling vcpkg_cmake_config_fixup
, but the tools path in MathGLTargets-debug.cmake
is still incorrect.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I use
vcpkg_copy_tools
to handle tools before callingvcpkg_cmake_config_fixup
, but the tools path inMathGLTargets-debug.cmake
is still incorrect.
Ah, I think you may need to make a patch to fix the tool installation path?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#28311 is more complete. CI testing of widgets components showed more problems. That's why it is still in progress.
Closed as duplicate of #28311. |
Describe the pull request
What does your PR fix?
Fixes Could not find mathglConfig.cmake #28285, fixes CMake not able to find MathGL #22264