Some updates to the cmake configuration