more fixes for https://stroika.atlassian.net/browse/STK-625 so unix builds with cmake
more fixes for https://stroika.atlassian.net/browse/STK-625 so unix builds with cmake

SophistSolutions/Stroika,SophistSolutions/Stroika,SophistSolutions/Stroika,SophistSolutions/Stroika,SophistSolutions/Stroika