Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix imgui is not properly set when DART_USE_SYSTEM_IMGUI=ON #1877

Merged
merged 3 commits into from
Nov 12, 2024

Conversation

jslee02
Copy link
Member

@jslee02 jslee02 commented Nov 11, 2024

This PR is to prevent the downstream packages need to manually add find_package(imgui), which is not ideal.

The generated dart_gui-osgComponent.cmake should contain both imgui and OpenSceneGraph.

Before:

set("dart_gui-osg_DEPENDENCIES" gui)
set("dart_gui-osg_LIBRARIES" dart-gui-osg)

set_property(DIRECTORY PROPERTY "DART_gui-osg_FOUND" TRUE)
foreach(external_dep OpenSceneGraph)
...
endforeach()

After:

set("dart_gui-osg_DEPENDENCIES" gui)
set("dart_gui-osg_LIBRARIES" dart-gui-osg)

foreach(external_dep OpenSceneGraph;imgui)
...
endforeach()

I also changed the error to a warning for building with old OSG (< 3.7.0) on macOS to allow building with the old version but with a patch for the issue.


Before creating a pull request

  • Document new methods and classes
  • Format new code files using ClangFormat by running make format
  • Build with -DDART_TREAT_WARNINGS_AS_ERRORS=ON and resolve all the compile warnings

Before merging a pull request

  • Set version target by selecting a milestone on the right side
  • Summarize this change in CHANGELOG.md
  • Add unit test(s) for this change
  • Add Python bindings for new methods and classes

@jslee02 jslee02 added this to the DART 6.15.0 milestone Nov 11, 2024
@jslee02 jslee02 changed the title Fix imgui is not properly set when when DART_USE_SYSTEM_IMGUI=ON Fix imgui is not properly set when DART_USE_SYSTEM_IMGUI=ON Nov 11, 2024
@jslee02 jslee02 marked this pull request as ready for review November 12, 2024 00:10
Copy link

codecov bot commented Nov 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.55%. Comparing base (26664f5) to head (ef736b5).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1877   +/-   ##
=======================================
  Coverage   61.55%   61.55%           
=======================================
  Files         490      490           
  Lines       46013    46013           
=======================================
  Hits        28325    28325           
  Misses      17688    17688           

@jslee02 jslee02 merged commit 096e95c into main Nov 12, 2024
28 checks passed
@jslee02 jslee02 deleted the fix_linking_system_imgui branch November 12, 2024 05:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant