fixes to cmake build
Merge branch 'for-llvm-3.5' of https://github.com/smackers/smack into for-llvm-3.5