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)
Status Name Job ID Coverage
  Build
passed build_linux_36 #216042
docker

00:04:51

passed build_linux_37 #216043
docker

00:04:52

passed build_macosx_36 #216040
macosx

00:13:29

passed build_macosx_37 #216041
macosx

00:13:27

 
  Deploy
passed deploy_beta #216044
docker

00:01:06