Improved cmake build