NB: full project builds are not affected because the LHCb top level CMakeLists (not shipped to lb-dev directories) has these fixes.