Merge branch 'make' into 'master'

[conda recipe] Add make next to cmake dependency

See merge request !19
5 jobs for master in 6 minutes and 46 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #217151
docker
build_linux_36

00:04:23

passed #217152
docker
build_linux_37

00:04:26

passed #217149
macosx
build_macosx_36

00:05:38

passed #217150
macosx
build_macosx_37

00:05:36

 
  Deploy
passed #217153
docker
deploy_beta

00:01:07