quick update to cmake.
fixed merge conflicts.