Updates of cmake finders and some windows fixes