Merge pull request #2411 from terrelln/cmake-fixes

[cmake] Fix source directory with spaces