Merge pull request #1357 from bryanzim/master

CMake fixes for paths with spaces