Add some braces to make newer GCCs happy and update CMakeLists.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81443 91177308-0d34-0410-b5e6-96231b3b80d8
3 files changed