Rework CMake files