bugfixes on cmake files
Merge branch 'feature/windows_port' into develop