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

[Conan] Use lower-case packages #2450

Merged
merged 13 commits into from Jul 12, 2019

Conversation

@bilke
Copy link
Member

commented Apr 2, 2019

Lower-case package names is now a Conan convention.

  • Renamed vtk and shapelib packages
  • Switched to official packages for eigen and qt

Attention @ufz/members: After this is merged there will be a conflict (on CMake-run) between upper-case and lower-case package names (on Windows and macOS). To fix this remove the upper-case packages from your Conan cache. I propose to do a complete cleanup of the cache by doing:

rm -r ~/.conan/data/*

OR just the affected packages:

conan remove --force VTK/*
conan remove --force Qt/*
conan remove --force Shapelib/*
conan remove --force Eigen3/*

Related: #2451, #2452

@TomFischer
Copy link
Member

left a comment

👍

@bilke bilke force-pushed the bilke:conan-qt branch from c47e480 to dec7fb6 Apr 2, 2019

@bilke bilke added the WIP 🏗 label Apr 2, 2019

@codecov

This comment has been minimized.

Copy link

commented Apr 3, 2019

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2450   +/-   ##
=======================================
  Coverage   32.96%   32.96%           
=======================================
  Files         555      555           
  Lines       20810    20810           
  Branches     9815     9815           
=======================================
  Hits         6861     6861           
  Misses      10447    10447           
  Partials     3502     3502

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 88c8a5f...186008d. Read the comment docs.

@bilke bilke force-pushed the bilke:conan-qt branch 6 times, most recently from 59bb55d to 362b994 Apr 3, 2019

bilke added some commits Apr 1, 2019

[Conan] Use Qt 5.11.3.
5.12 introduced lots of new options and dependencies, could
not get it to work...

@bilke bilke force-pushed the bilke:conan-qt branch 2 times, most recently from cdd8002 to 14e2c76 Jul 10, 2019

@bilke bilke force-pushed the bilke:conan-qt branch 3 times, most recently from 83582b6 to de0b0ce Jul 11, 2019

@bilke bilke force-pushed the bilke:conan-qt branch from 44eb7f8 to 9218caf Jul 11, 2019

@bilke bilke force-pushed the bilke:conan-qt branch from 9ad98fe to 9dcd1a0 Jul 11, 2019

@bilke bilke merged commit bb478a6 into ufz:master Jul 12, 2019

1 of 3 checks passed

continuous-integration/jenkins/pr-merge This commit is being built
Details
ufz.ogs in progress
Details
deploy/netlify Deploy preview ready!
Details

@bilke bilke deleted the bilke:conan-qt branch Jul 12, 2019

@bilke bilke removed the WIP 🏗 label Jul 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.