Added a TODO comment for better handling of LCMS_CFLAGS
Refactor architecture cmake code