re #8924 solve cmakelist merge issue