add cmake and isk fix