MacOS version
Merge remote-tracking branch 'origin/BCI' into MacOS
change cmake files
merge cmake list
merge MacOS