Improve CMake build files