Remove deprecations: tock #1091
Conversation
Signed-off-by: Carlos Agüero <[email protected]>
Co-authored-by: Ian Chen <[email protected]> Signed-off-by: Carlos Agüero <[email protected]>
| @@ -151,8 +151,6 @@ endif() | |||
| set(GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR | |||
| ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins | |||
| ) | |||
| set(GZ_RENDERING_ENGINE_INSTALL_DIR | |||
| ${CMAKE_INSTALL_PREFIX}/${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) | |||
There was a problem hiding this comment.
I think we may still need to keep this cmake variable here as I see that these are being used in ogre/src/CMakeLists.txt and ogre2/src/CMakeLists.txt
There was a problem hiding this comment.
Can we replace these calls with getResourcePath()?
There was a problem hiding this comment.
getResourcePath() is a C++ function so we won't be able to replace those calls in CMakeLists.txt. I think we can just keep this cmake var here. Other changes in this PR are fine.
There was a problem hiding this comment.
Sorry I meant GZ_RENDERING_RESOURCE_PATH, that it's used in some .cc files (although also in optix/src/CMakeLists.txt).
There was a problem hiding this comment.
oh do you see the macro used in cc files? For example, I see usage like this that it just gets the value directly from the GZ_RENDERING_RESOURCE_PATH environment variable (instead of the macro from config.hh).
There was a problem hiding this comment.
to clarify, I think we are still keeping the environment variable and only deprecating the macro? Or are we deprecating / removing both?
There was a problem hiding this comment.
Sorry for the confusion. I think what we want is to remove just the GZ_RENDERING_RESOURCE_PATH macro and nothing else. We'll keep supporting the environment variables. 6bd5db5
Signed-off-by: Carlos Agüero <[email protected]>
Migration.md
Outdated
| @@ -12,9 +12,6 @@ release will remove the deprecated code. | |||
| 1. The macro `GZ_RENDERING_RESOURCE_PATH` is removed. Use | |||
| `gz::rendering::getResourcePath()` instead. | |||
|
|
|||
| 1. The macro `GZ_RENDERING_ENGINE_INSTALL_DIR` is removed. Use | |||
| `gz::rendering::getEngineInstallDir()` instead. | |||
There was a problem hiding this comment.
So a little confusing but there are 3 forms of GZ_RENDERING_ENGINE_INSTALL_DIR
- cmake variable in CMakeLists.txt
- C++ macro in config.hh.in
- environment variable
We removed the C++ macro (and kept the other two). So we can keep this entry in Migration.md
There was a problem hiding this comment.
That's right, thanks. c383af1
Signed-off-by: Carlos Agüero <[email protected]>
🦟 Bug fix
Perform the tock of the tick-tock cycle and remove / move deprecated code.
Summary
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.