Updated CFA cmakelists and fixed compilation errors.