undef for IX before redef, add to CMakeLists

Adding an undef to prevent warnings / errors on W4, adding to CMakeLists.