Adding more config defines
Merge branch 'cmake' of ../XVision2-cmake into cmake