Fixes to CMake build
Fixes to CMake build

Make sure that proper XML defines are set
Make sure that HARP_UDUNITS2_NAME_MANGLE is set for the udunits2 build

stcorp/harp,stcorp/harp,stcorp/harp,stcorp/harp,stcorp/harp,stcorp/harp