port cmake differences from tag v0.1.6

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>