Commit 05415010 authored by Jeremy Cohen's avatar Jeremy Cohen

Reverted change to quote MPIEXEC variable path via cmake and switching to...

Reverted change to quote MPIEXEC variable path via cmake and switching to quoting directly in Tester.cpp.in
parent 8df360de
......@@ -27,16 +27,6 @@ IF( NEKTAR_USE_MPI )
INCLUDE_DIRECTORIES(SYSTEM ${MPI_CXX_INCLUDE_PATH} )
MESSAGE(STATUS "Found MPI: ${MPI_CXX_LIBRARIES}")
# If we're using WIN32, mpiexec is likely to be in a directory with
# a space in the path so we need to quote the path so that it is run
# correctly by the Tester...
# Update based on MPIEXEC_EXECUTABLE so that we don't get extra quotes
# added every time CMake is run!
MESSAGE(STATUS "Found MPI Executable: ${MPIEXEC}")
IF (WIN32)
SET(MPIEXEC "\\\"${MPIEXEC_EXECUTABLE}\\\"" CACHE STRING "MPI job launching command")
MESSAGE(STATUS "Updated MPIEXEC for Win32 platform: ${MPIEXEC}")
ENDIF ()
ELSE()
SET(MPI_BUILTIN ON)
MESSAGE(STATUS "Found MPI: built in")
......
......@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
continue;
}
command += "@MPIEXEC@ ";
command += "\"@MPIEXEC@\" ";
if (std::string("@NEKTAR_TEST_USE_HOSTFILE@") == "ON")
{
command += "-hostfile hostfile ";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment