Changed CMake files to accomodate last commit