Now it compile on windows
Merge branch 'cmake_build' into develop