improvement of cmake