Update CMake build to be in line with makefile and VS2012 build