Updated to match changed CMake functions.
Merge branch 'next' into sync_fix