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

[Windows][master] Fix various build breaks found in Windows build #1880

Merged
merged 5 commits into from
Feb 7, 2020

Conversation

seanyen
Copy link
Contributor

@seanyen seanyen commented Feb 5, 2020

Description

Fix various build breaks found in Windows build:

  • Conditionally guard some add_compile_options doesn't apply to MSVC.
  • Add zlib as a dependency to look for in Boost. (On Windows, boost::iostreams depends on boost::zlib at linkage time.)
  • Replace glut and GLEW with the CMake variables.

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

Copy link
Contributor

@rhaschke rhaschke left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

Copy link
Contributor

@rhaschke rhaschke left a comment

Choose a reason for hiding this comment

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

Unfortunately the addition of zlib fails on Linux, as zlib is usually not part of boost. Please fix.

@seanyen
Copy link
Contributor Author

seanyen commented Feb 6, 2020

Unfortunately the addition of zlib fails on Linux, as zlib is usually not part of boost. Please fix.

Thanks. I added a conditional guard on this. Waiting for the CI result...

@codecov-io
Copy link

Codecov Report

Merging #1880 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1880   +/-   ##
=======================================
  Coverage   50.26%   50.26%           
=======================================
  Files         313      313           
  Lines       24622    24622           
=======================================
  Hits        12377    12377           
  Misses      12245    12245

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f6308f4...cce11ce. Read the comment docs.

@seanyen
Copy link
Contributor Author

seanyen commented Feb 6, 2020

CI looks green now.

@seanyen
Copy link
Contributor Author

seanyen commented Feb 6, 2020

@rhaschke This is ready for review again. Thanks!

Copy link
Contributor

@rhaschke rhaschke left a comment

Choose a reason for hiding this comment

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

Fine with me now. Thanks.

@rhaschke rhaschke added the awaits 2nd review one maintainer approved this request label Feb 6, 2020
Copy link
Contributor

@gavanderhoorn gavanderhoorn left a comment

Choose a reason for hiding this comment

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

Unfortunately we don't have a Windows CI set up, but @seanyen has built this, so 👍

@gavanderhoorn gavanderhoorn removed the awaits 2nd review one maintainer approved this request label Feb 7, 2020
@rhaschke rhaschke merged commit 45346d6 into moveit:master Feb 7, 2020
rhaschke pushed a commit to ubi-agni/moveit that referenced this pull request Feb 8, 2020
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

4 participants