Restore support for older MS MPI include path 22/5122/1
authorEvan Ramos <evan@hpccharm.com>
Fri, 26 Apr 2019 17:04:26 +0000 (12:04 -0500)
committerEvan Ramos <evan@hpccharm.com>
Fri, 26 Apr 2019 17:04:26 +0000 (12:04 -0500)
Change-Id: Ic2e6bd7752a1a2125c947fdf9dc83a4db180f4f1

src/arch/mpi-win64/conv-mach.sh

index 060ff9bc5fd58559480bb9f8c1e2a8f5478541b6..895810f93c6f8c7d28cab32a37f5bdbcb0f596f6 100644 (file)
@@ -29,10 +29,15 @@ else
 fi
 HPC_SDK=`cygpath -d "$HPC_SDK"`
 
-MSMPI_INCLUDE="-I `cygpath -u "$HPC_SDK\Include"`"
+HPC_SDK_INCLUDE="$HPC_SDK\Inc"
+if ! test -d "$HPC_SDK_INCLUDE"
+then
+  HPC_SDK_INCLUDE="$HPC_SDK\Include"
+fi
+MSMPI_INCLUDE="-I `cygpath -u "$HPC_SDK_INCLUDE"`"
 if test -n "MSMPI_SUFFIX_INC"
 then
-  MSMPI_INCLUDE="-I `cygpath -u "$HPC_SDK\Include$MSMPI_SUFFIX_INC"` $MSMPI_INCLUDE"
+  MSMPI_INCLUDE="-I `cygpath -u "$HPC_SDK_INCLUDE$MSMPI_SUFFIX_INC"` $MSMPI_INCLUDE"
 fi
 
 CMK_SYSINC="$MSMPI_INCLUDE"