Several cmake fixed, mainly for Win32.
Merge branch 'develop' of https://github.com/Garrappachc/Vatsinator into develop