Added extractFeatures to cmake + fixed includes for it