Updated CMake for VS2012
Merge branch 'VS2012Support'