Some cmake related features added