From 8612d4ace9c1ce4b23629e2f3872a4ca5de29501 Mon Sep 17 00:00:00 2001 From: ct-clmsn Date: Mon, 16 Oct 2023 10:50:36 -0400 Subject: [PATCH 1/3] working issue with MPI_CC / CC conflict in automake --- cmake/HPX_SetupGasnet.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/HPX_SetupGasnet.cmake b/cmake/HPX_SetupGasnet.cmake index 2914e0130b60..80d139458d9e 100644 --- a/cmake/HPX_SetupGasnet.cmake +++ b/cmake/HPX_SetupGasnet.cmake @@ -153,11 +153,11 @@ macro(hpx_setup_gasnet) endif() if(${MPI_C_COMPILER}) - set(CMAKE_C_COMPILER ${MPI_C_COMPILER}) + set(MPI_C_COMPILER ${CMAKE_C_COMPILER}) elseif(${MPI_CC}) - set(CMAKE_C_COMPILER ${MPI_CC}) + set(MPI_CC ${CMAKE_C_COMPILER}) elseif(ENV{MPI_CC}) - set(CMAKE_C_COMPILER ENV{MPI_CC}) + set(ENV{MPI_CC} ${CMAKE_C_COMPILER}) else() message(FATAL_ERROR "GASNet MPI Conduit selected; $MPI_CC not found!") endif() From 20391ec86366fd72bfe34b2c2d4284cee9c8c610 Mon Sep 17 00:00:00 2001 From: ct-clmsn Date: Mon, 16 Oct 2023 10:54:37 -0400 Subject: [PATCH 2/3] working issue with MPI_CC / CC conflict in automake --- cmake/HPX_SetupGasnet.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/HPX_SetupGasnet.cmake b/cmake/HPX_SetupGasnet.cmake index 80d139458d9e..cdfb09c9acaf 100644 --- a/cmake/HPX_SetupGasnet.cmake +++ b/cmake/HPX_SetupGasnet.cmake @@ -154,9 +154,13 @@ macro(hpx_setup_gasnet) if(${MPI_C_COMPILER}) set(MPI_C_COMPILER ${CMAKE_C_COMPILER}) + set(MPI_CC ${CMAKE_C_COMPILER}) + set(ENV{MPI_CC} ${CMAKE_C_COMPILER}) elseif(${MPI_CC}) set(MPI_CC ${CMAKE_C_COMPILER}) + set(ENV{MPI_CC} ${CMAKE_C_COMPILER}) elseif(ENV{MPI_CC}) + set(MPI_CC ${CMAKE_C_COMPILER}) set(ENV{MPI_CC} ${CMAKE_C_COMPILER}) else() message(FATAL_ERROR "GASNet MPI Conduit selected; $MPI_CC not found!") From bd490d26ee4a406e69aa5005b4b10323e9a34bf1 Mon Sep 17 00:00:00 2001 From: ct-clmsn Date: Mon, 16 Oct 2023 12:21:53 -0400 Subject: [PATCH 3/3] working issue with MPI_CC / CC conflict in automake --- cmake/HPX_SetupGasnet.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/HPX_SetupGasnet.cmake b/cmake/HPX_SetupGasnet.cmake index cdfb09c9acaf..26653ac1d944 100644 --- a/cmake/HPX_SetupGasnet.cmake +++ b/cmake/HPX_SetupGasnet.cmake @@ -159,13 +159,17 @@ macro(hpx_setup_gasnet) elseif(${MPI_CC}) set(MPI_CC ${CMAKE_C_COMPILER}) set(ENV{MPI_CC} ${CMAKE_C_COMPILER}) - elseif(ENV{MPI_CC}) + elseif($ENV{MPI_CC}) set(MPI_CC ${CMAKE_C_COMPILER}) set(ENV{MPI_CC} ${CMAKE_C_COMPILER}) else() message(FATAL_ERROR "GASNet MPI Conduit selected; $MPI_CC not found!") endif() + if(NOT "$CMAKE_C_COMPILER" STREQUAL "${MPI_CC}") + message(FATAL_ERROR "GASNet MPI: $MPI_CC != $CMAKE_C_COMPILER!") + endif() + execute_process( COMMAND bash -c