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

glib fix for Windows #154

Merged
merged 4 commits into from
Mar 12, 2021
Merged

glib fix for Windows #154

merged 4 commits into from
Mar 12, 2021

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Feb 14, 2021

🦟 Bug fix

Summary

This is needed to compile ign-common3 on Windows. This patch is applied to the ignition-cmake2 package on conda-forge, as explained here. That's why our Windows source install tutorial tells users to build everything from source, except for ign-cmake. But we should be building everything from source.

I checked that this works on Windows, but I'll leave it as a draft until it can be verified on other platforms too.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge

Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina added bug Something isn't working Windows Windows support labels Feb 14, 2021
@github-actions github-actions bot added 🏢 edifice Ignition Edifice 🏰 citadel Ignition Citadel 📜 blueprint Ignition Blueprint 🔮 dome Ignition Dome labels Feb 14, 2021
@chapulina
Copy link
Contributor Author

@osrf-jenkins run tests again

@chapulina chapulina requested a review from j-rivero March 10, 2021 21:11
@chapulina
Copy link
Contributor Author

Opening for review, I think this shouldn't have adverse effects, because the worst that can happen is that the strings GLIB_INCLUDE_DIR-NOTFOUND and GLIBCONFIG_INCLUDE_DIR-NOTFOUND get appended to GTS_INCLUDE_DIRS. I think that adding invalid include paths shouldn't break anything.

@chapulina chapulina marked this pull request as ready for review March 10, 2021 21:46
cmake/FindGTS.cmake Outdated Show resolved Hide resolved
cmake/FindGTS.cmake Outdated Show resolved Hide resolved
Signed-off-by: Louise Poubel <[email protected]>
@adlarkin adlarkin merged commit 01039be into ign-cmake2 Mar 12, 2021
@adlarkin adlarkin deleted the chapulina/2/glib branch March 12, 2021 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📜 blueprint Ignition Blueprint bug Something isn't working 🏰 citadel Ignition Citadel 🔮 dome Ignition Dome 🏢 edifice Ignition Edifice Windows Windows support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants