CMake were changed to work with the new build
Shows cleaner usage of CMake files