fixup! Switch from makefile to cmake