Fix test_config.h to include real engines found (gz-rendering6) #1089
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,16 +9,33 @@ | |
| #define RENDER_ENGINE_VALUES ::testing::ValuesIn(\ | ||
| gz::rendering::TestValues()) | ||
|
|
||
| #include <vector> | ||
| #include <gz/common/Util.hh> | ||
| #include <gz/rendering/config.hh> | ||
|
|
||
| /// \todo(anyone) re-enable ogre2 test once ogre 2.2 works on macOS | ||
| #ifdef __APPLE__ | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"}; | ||
| #else | ||
| #if defined(HAVE_OGRE) && defined(HAVE_OPTIX) && defined(HAVE_OGRE2) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre", "ogre2", "optix"}; | ||
|
There was a problem hiding this comment. I remember why we have the weird logic with hardcoded engine names. In fortress, we can't run Note that the tests fixture is revamped in #685 so Harmonic does not have this issue any more. |
||
| #elif defined(HAVE_OGRE) && defined(HAVE_OPTIX) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"}; | ||
| #elif defined(HAVE_OGRE) && defined(HAVE_OGRE2) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre", "ogre2"}; | ||
|
There was a problem hiding this comment. see above, we can't have |
||
| #elif defined(HAVE_OGRE2) && defined(HAVE_OPTIX) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"}; | ||
| #elif defined(HAVE_OGRE) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre"}; | ||
| #elif defined(HAVE_OGRE2) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre2"}; | ||
| #elif defined(HAVE_OPTIX) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"optix"}; | ||
| #else | ||
| #warning "Can not detect a rendering engine support: ogre | ogre2 | optix" | ||
| #endif | ||
| #endif | ||
|
|
||
| namespace ignition | ||
| { | ||
| namespace rendering | ||
|
|
||
Oops, something went wrong.
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.
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.
@iche033 does it make sense to have optix in Mac?
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.
we never tested it on mac so I think can just remove optix here
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.
c861a44