I'm not sure I like the idea of removing the DIRECTORY part. I already dislike the layout of this macro, most CMake functions take a full relative path, splitting it into directory and file name is odd (but we can't change that now). In place of fixing that I think we should be explicit about the DIRECTORY those files are expected to be in.