Merge pull request #116 from biddisco/master

Fix a compilation error on clang
set cmake git repo to jb's clone until merged
Change CMAKE vars to better support build as a subproject'