Merge branch 'make' into 'master'

[conda recipe] Add make next to cmake dependency

See merge request !31
5 jobs for master in 14 minutes and 35 seconds (queued for 2 seconds)