FindMPI.cmake with Cray PE wrappers+Intel compiler

I’m having some difficulty getting FindMPI.cmake to recognize Cray MPICH when using the Cray PE wrappers for the Intel compilers (Cray wrappers with Cray compilers is not a problem). It seems that the file assumes that Cray wrapper implies Cray compiler. I can get a little closer to working if I set MPI_C_COMPILER, but it still fails on account of include dirs not being found. As far as I know, when the cray-mpich env module is loaded, the wrappers have everything needed to compile with MPI, so I don’t think library/include directories should be needed. Is there some way I can convince FindMPI.cmake to not care about finding anything other than the executables?

I suspect that the @chuckatkins ping that would be most useful here is a dead end now. But maybe not…