diff --git a/modules/find/FindHYPRE.cmake b/modules/find/FindHYPRE.cmake index c54090f5f3f89222f0be82727fcd9eb810872be5..b6d35342ca0d3df8513becfb3c516a98c357f2b7 100644 --- a/modules/find/FindHYPRE.cmake +++ b/modules/find/FindHYPRE.cmake @@ -113,7 +113,9 @@ if(HYPRE_LIBRARIES) if (${MPI_C_LINK_FLAGS} MATCHES " -") string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS}) endif() - list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel") + list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + endif() endif() list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") endif() diff --git a/modules/find/FindMUMPS.cmake b/modules/find/FindMUMPS.cmake index d99eee37db801149d96774e914300565dec722b3..31a5d8a248b2335e005af0ce308f9771324282f4 100644 --- a/modules/find/FindMUMPS.cmake +++ b/modules/find/FindMUMPS.cmake @@ -436,7 +436,10 @@ if(MUMPS_LIBRARIES) if (${MPI_Fortran_LINK_FLAGS} MATCHES " -") string(REGEX REPLACE " -" "-" MPI_Fortran_LINK_FLAGS ${MPI_Fortran_LINK_FLAGS}) endif() - list(APPEND REQUIRED_LDFLAGS "${MPI_Fortran_LINK_FLAGS}") + # bug with intelmpi --enable-new-dtags -Xlinker -rpath -Xlinker ... + if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "Intel") + list(APPEND REQUIRED_LDFLAGS "${MPI_Fortran_LINK_FLAGS}") + endif() endif() list(APPEND REQUIRED_LIBS "${MPI_Fortran_LIBRARIES}") endif() diff --git a/modules/find/FindPAMPA.cmake b/modules/find/FindPAMPA.cmake index 54c90d3b964c79766a7495aa27e901d26e5824e0..ba888d72861421f5558ffddbbcdba7fbe653de28 100644 --- a/modules/find/FindPAMPA.cmake +++ b/modules/find/FindPAMPA.cmake @@ -129,7 +129,9 @@ if(PAMPA_LIBRARIES) if (${MPI_C_LINK_FLAGS} MATCHES " -") string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS}) endif() - list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel") + list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + endif() endif() list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") endif() diff --git a/modules/find/FindPARMETIS.cmake b/modules/find/FindPARMETIS.cmake index 7cb5c2a5ef7c90c8795734fff6b68b5209225040..d8056e1cb1f4ba68f9fd866028563dbe6adac6ea 100644 --- a/modules/find/FindPARMETIS.cmake +++ b/modules/find/FindPARMETIS.cmake @@ -134,7 +134,9 @@ if(PARMETIS_LIBRARIES) if (${MPI_C_LINK_FLAGS} MATCHES " -") string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS}) endif() - list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel") + list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + endif() endif() list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") endif() diff --git a/modules/find/FindPTSCOTCH.cmake b/modules/find/FindPTSCOTCH.cmake index 66c6c23288fbbca46998e760a1852f25c7e81dfe..58b4549b9b5780e1b25bfd558549a44185e82981 100644 --- a/modules/find/FindPTSCOTCH.cmake +++ b/modules/find/FindPTSCOTCH.cmake @@ -150,7 +150,9 @@ if(PTSCOTCH_LIBRARIES) if (${MPI_C_LINK_FLAGS} MATCHES " -") string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS}) endif() - list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel") + list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}") + endif() endif() list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") endif()