Skip to content

rewrite hack to avoid CMake warning with assimp 5.0.1 and older, apply cross platform#565

Merged
dirk-thomas merged 1 commit intoros2from
dirk-thomas/assimp-cmake-warning-hack-macos
Jun 17, 2020
Merged

rewrite hack to avoid CMake warning with assimp 5.0.1 and older, apply cross platform#565
dirk-thomas merged 1 commit intoros2from
dirk-thomas/assimp-cmake-warning-hack-macos

Conversation

@dirk-thomas
Copy link
Copy Markdown
Member

@dirk-thomas dirk-thomas commented Jun 17, 2020

This addresses the remaining CMake warning on macOS from #524 (comment).

macOS CI of rviz_assimp_vendor:
Before: Build Status
After: Build Status

CI builds testing all packages including and above rviz_assimp_vendor:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

macOS packaging passing without a CMake warning: Build Status

…y cross platform

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas dirk-thomas added the bug Something isn't working label Jun 17, 2020
@dirk-thomas dirk-thomas requested a review from wjwwood June 17, 2020 05:29
@dirk-thomas dirk-thomas self-assigned this Jun 17, 2020
Copy link
Copy Markdown
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

Overriding ON gives me the shivers.

@dirk-thomas
Copy link
Copy Markdown
Member Author

Overriding ON gives me the shivers.

At least I set it to 1 and not to 0... 🤯 🤣

@dirk-thomas dirk-thomas merged commit b255e54 into ros2 Jun 17, 2020
@delete-merged-branch delete-merged-branch bot deleted the dirk-thomas/assimp-cmake-warning-hack-macos branch June 17, 2020 17:50
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

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants