cmake editor
build fixes
build fixes
build fixes