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

[build] Fix GLUT dependency handling on Windows #1827

Merged
merged 4 commits into from
Jul 6, 2024
Merged

[build] Fix GLUT dependency handling on Windows #1827

merged 4 commits into from
Jul 6, 2024

Conversation

jslee02
Copy link
Member

@jslee02 jslee02 commented Jul 6, 2024

The detection of GLUT is already handled by dart_check_optional_package() (will skip building the osg component), so there is no need to check it again. Additionally, the logic if(NOT WIN32 OR CYGWIN) is inconsistent.

As a result, FindDARTGLUT.cmake is not installed on Windows:

Linux:
https://dev.azure.com/conda-forge/feedstock-builds/_build/results?buildId=969952&view=logs&j=656edd35-690f-5c53-9ba3-09c10d0bea97&t=986b1512-c876-5f92-0d81-ba851554a0a3&l=1964

Windows:
https://dev.azure.com/conda-forge/feedstock-builds/_build/results?buildId=969952&view=logs&j=a70f640f-cc53-5cd3-6cdc-236a1aa90802&t=6119ccbe-9301-594f-7c27-f792b80a7fcc&l=2373


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

Copy link

codecov bot commented Jul 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.56%. Comparing base (4878e77) to head (6fd87e3).

Additional details and impacted files
@@              Coverage Diff              @@
##           release-6.14    #1827   +/-   ##
=============================================
  Coverage         61.56%   61.56%           
=============================================
  Files               490      490           
  Lines             46021    46021           
=============================================
  Hits              28332    28332           
  Misses            17689    17689           

@jslee02
Copy link
Member Author

jslee02 commented Jul 6, 2024

Confirmed that DARTFindGLUT.cmake is installed on Windows

@jslee02 jslee02 marked this pull request as ready for review July 6, 2024 05:26
@jslee02 jslee02 merged commit d594c78 into release-6.14 Jul 6, 2024
32 checks passed
@jslee02 jslee02 deleted the glut branch July 6, 2024 07:49
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.

None yet

1 participant