rewrite hack to avoid CMake warning with assimp 5.0.1 and older, apply cross platform #565
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
…y cross platform Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
jacobperron
approved these changes
Jun 17, 2020
At least I set it to |
delete-merged-branch
bot
deleted the
dirk-thomas/assimp-cmake-warning-hack-macos
branch
wjwwood
added a commit
that referenced
this pull request
Jun 23, 2020
* restore compatibility with older Qt versions (#561) Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com> * Suppress warnings when building with older Qt versions. (#562) Signed-off-by: Chris Lalancette <clalancette@openrobotics.org> * Don't try to moc generate env_config.hpp file. (#550) This removes one more warning from rviz_common builds. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org> * rewrite hack to avoid CMake warning with assimp 5.0.1 and older, apply cross platform (#565) Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com> * Use dedicated TransformListener thread (#551) Signed-off-by: ymd-stella <world.applepie@gmail.com> * restore alphabetical include order (#563) Signed-off-by: Karsten Knese <karsten@openrobotics.org> * Don't install test header files in rviz_rendering. (#564) * Don't install test header files in rviz_rendering. This change started as a relatively simple try at not installing test includes when installing rviz_rendering. As you can see, it ballooned into quite a large change, so here is an explanation of why. We shouldn't install test include header files when installing the package; that just ends up on the end user system, and is a non-supported API. Worse, we don't want to compile test code in our main library. Yet rviz_rendering is currently doing both of these things. Unfortunately, it is somewhat tricky to make that code and header file private. The problem is that that test code is used in rviz_rendering, rviz_common, rviz_default_plugins, and rviz_rendering_tests. One solution might be to extract that test code into its own package, and then have all of the other packages depend on it. The problem is that that test package would both be depended on by rviz_rendering (for tests), and depends itself on rviz_rendering (for its functionality), creating a dependency loop. The solution I opted for here is to copy the test code into the appropriate packages. This leads to some duplication of functionality, but it effectively breaks the dependency loop and succeeds in eliminating the test code from our installed library. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org> Co-authored-by: Dirk Thomas <dirk-thomas@users.noreply.github.com> Co-authored-by: Chris Lalancette <clalancette@openrobotics.org> Co-authored-by: ymd-stella <7959916+ymd-stella@users.noreply.github.com> Co-authored-by: Karsten Knese <Karsten1987@users.noreply.github.com>
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.
This addresses the remaining CMake warning on macOS from #524 (comment).
macOS CI of
rviz_assimp_vendor:Before:
After:
CI builds testing all packages including and above
rviz_assimp_vendor:macOS packaging passing without a CMake warning: