makefileresolver: Fix CMake code
makefileresolver: Cleanup CMake code