Added quoting for source and binary paths
Merge branch 'bug-18547-modernize-cmake'