Merge "cmake: fix compilation w/Xcode generator"