universal check for MPIEXEC

Author: scivision

.github/workflows/cmake.yml

@@ -59,13 +59,7 @@ jobs:
       run: curl -L -O https://github.com/microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisetup.exe
 
     - name: Install mpiexec.exe (-force needed to bypass GUI on headless)
-      run: .\msmpisetup.exe -unattend -force
-
-    - name: Assert file existence
-      run: if (-not (Test-Path -Path "C:\Program Files\Microsoft MPI\Bin\mpiexec.exe" -PathType Leaf)) { exit 1 }
-
-    - name: put MSMPI_BIN on PATH (where mpiexec is)
-      run: echo "C:\Program Files\Microsoft MPI\Bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      run: .\msmpisetup.exe -unattend -force -verbose
 
     - uses: actions/checkout@v4
 

cmake/mpi_launcher.cmake

@@ -1,6 +1,6 @@
 function(test_mpi_launcher target test Nworker)
 
-if(NOT (DEFINED MPIEXEC_EXECUTABLE AND DEFINED MPIEXEC_NUMPROC_FLAG))
+if(NOT MPIEXEC_EXECUTABLE OR NOT MPIEXEC_NUMPROC_FLAG)
   message(FATAL_ERROR "MPIEXEC_EXECUTABLE and MPIEXEC_NUMPROC_FLAG must be defined to use test_mpi_launcher")
 endif()
 

test/CMakeLists.txt

@@ -38,11 +38,11 @@ target_link_libraries(mpi_pass PRIVATE MPI::MPI_Fortran)
 
 add_test(NAME MPIpass COMMAND mpi_pass)
 test_mpi_launcher(mpi_pass MPIpass 2)
-set_property(TEST MPIpass PROPERTY FIXTURES_REQUIRED mpi_fxt)
 
 set_tests_properties(MPIpass PROPERTIES
 LABELS "Fortran"
 DISABLED $<VERSION_LESS:${MPIEXEC_MAX_NUMPROCS},2>
+FIXTURES_REQUIRED mpi_fxt
 )