Enhance cmake build