cds.lib generation should handle any DEFINE not part of cdp4? blocation needs to be updated. Ideally there should be only one place where this needs to be set.