CMake files improvement