Skip to content

[ogre] Fix include path in usage#19520

Closed
NancyLi1013 wants to merge 4 commits intomicrosoft:masterfrom
NancyLi1013:dev/NancyLi/fix-include-path-in-ogre
Closed

[ogre] Fix include path in usage#19520
NancyLi1013 wants to merge 4 commits intomicrosoft:masterfrom
NancyLi1013:dev/NancyLi/fix-include-path-in-ogre

Conversation

@NancyLi1013
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

    Fixes [ogre] Cannot open include file #15333

    Replace #include "OgreRTShaderSystem.h" as #include "../RTShaderSystem/OgreRTShaderSystem.h" in ../Bites/OgreSGTechniqueResolverListener.h file.

Note: No need to test features.

@NancyLi1013 NancyLi1013 added category:port-bug The issue is with a library, which is something the port should already support info:internal labels Aug 12, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 63aa65e65b9d2c08772ea15d25fb8fdb0d32e557 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json
index c25ea69..796f980 100644
--- a/versions/o-/ogre.json
+++ b/versions/o-/ogre.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "19babe49543ff790585bbc026326fe05446f9ea7",
+      "git-tree": "9c35ef4f5b30d305e6a128f9531692a64eae1b4a",
       "version-semver": "1.12.9",
       "port-version": 6
     },

@NancyLi1013 NancyLi1013 added the depends:different-pr This PR or Issue depends on a PR which has been filed label Aug 20, 2021
@NancyLi1013
Copy link
Contributor Author

Depends on #19633

@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Aug 23, 2021
@NancyLi1013 NancyLi1013 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Aug 27, 2021
@@ -65,7 +61,6 @@ vcpkg_configure_cmake(
-DOGRE_BUILD_RENDERSYSTEM_D3D11=ON
-DOGRE_BUILD_RENDERSYSTEM_GL=ON
-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove:

-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this option doesn't exist on the current source codes.

endforeach()
endif()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/OGRE/Bites/OgreSGTechniqueResolverListener.h" "OgreRTShaderSystem.h" "../RTShaderSystem/OgreRTShaderSystem.h")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a bug in upstream, has it been reported there?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also it seems unlikely that this is the only header affected; in the issue report the user says that they would have to edit "hundreds of header files", not only this one. I'm not positive what the correct fix is but I don't think this is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing this out. Since this only affects the usage in the project. I'm not sure if this is a upstream bug. In user's project sample, there is only one place that needs to update. For other header files, it is due to the user didn't include the header path correctly in his project.

The same kinds of problem may be also in other header files. I also have no better way to solve this. I'll report this problem to upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upstream issue OGRECave/ogre#2172

@BillyONeal BillyONeal added requires:author-response and removed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. labels Aug 30, 2021
@BillyONeal BillyONeal added depends:upstream-changes Waiting on a change to the upstream project and removed requires:author-response labels Aug 31, 2021
@NancyLi1013
Copy link
Contributor Author

Closing this PR since this is described as expected behavior by Ogre maintainers. It's unnecessary to handle this in vcpkg side now. Please see OGRECave/ogre#2172 (comment) and OGRECave/ogre#2172 (comment).

@NancyLi1013 NancyLi1013 closed this Sep 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support depends:upstream-changes Waiting on a change to the upstream project

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[ogre] Cannot open include file

3 participants