From 583dbc00582dbd65b43edc35b9406b07e40789d3 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Tue, 21 Feb 2023 09:50:21 +0100
Subject: [PATCH] Fix link problem with mpi: unrecognised option: -rpath -Wl
---
modules/find/FindHYPRE.cmake | 8 --------
modules/find/FindMUMPS.cmake | 9 ---------
modules/find/FindPAMPA.cmake | 8 --------
modules/find/FindPARMETIS.cmake | 8 --------
modules/find/FindPTSCOTCH.cmake | 8 --------
5 files changed, 41 deletions(-)
diff --git a/modules/find/FindHYPRE.cmake b/modules/find/FindHYPRE.cmake
index b6d3534..2625c8f 100644
--- a/modules/find/FindHYPRE.cmake
+++ b/modules/find/FindHYPRE.cmake
@@ -109,14 +109,6 @@ if(HYPRE_LIBRARIES)
if (MPI_C_INCLUDE_PATH)
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
- if (MPI_C_LINK_FLAGS)
- if (${MPI_C_LINK_FLAGS} MATCHES " -")
- string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
- endif()
- 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()
# libm
diff --git a/modules/find/FindMUMPS.cmake b/modules/find/FindMUMPS.cmake
index 31a5d8a..512a261 100644
--- a/modules/find/FindMUMPS.cmake
+++ b/modules/find/FindMUMPS.cmake
@@ -432,15 +432,6 @@ if(MUMPS_LIBRARIES)
if (MPI_C_INCLUDE_PATH)
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
- if (MPI_Fortran_LINK_FLAGS)
- if (${MPI_Fortran_LINK_FLAGS} MATCHES " -")
- string(REGEX REPLACE " -" "-" MPI_Fortran_LINK_FLAGS ${MPI_Fortran_LINK_FLAGS})
- endif()
- # 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()
# SCOTCH
diff --git a/modules/find/FindPAMPA.cmake b/modules/find/FindPAMPA.cmake
index ba888d7..2b2acaa 100644
--- a/modules/find/FindPAMPA.cmake
+++ b/modules/find/FindPAMPA.cmake
@@ -125,14 +125,6 @@ if(PAMPA_LIBRARIES)
if (MPI_C_INCLUDE_PATH)
list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}")
endif()
- if (MPI_C_LINK_FLAGS)
- if (${MPI_C_LINK_FLAGS} MATCHES " -")
- string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
- endif()
- 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()
# PTSCOTCH
diff --git a/modules/find/FindPARMETIS.cmake b/modules/find/FindPARMETIS.cmake
index d8056e1..06eda03 100644
--- a/modules/find/FindPARMETIS.cmake
+++ b/modules/find/FindPARMETIS.cmake
@@ -130,14 +130,6 @@ if(PARMETIS_LIBRARIES)
if (MPI_C_INCLUDE_PATH)
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
- if (MPI_C_LINK_FLAGS)
- if (${MPI_C_LINK_FLAGS} MATCHES " -")
- string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
- endif()
- 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()
# m
diff --git a/modules/find/FindPTSCOTCH.cmake b/modules/find/FindPTSCOTCH.cmake
index 58b4549..37e9b80 100644
--- a/modules/find/FindPTSCOTCH.cmake
+++ b/modules/find/FindPTSCOTCH.cmake
@@ -146,14 +146,6 @@ if(PTSCOTCH_LIBRARIES)
if (MPI_C_INCLUDE_PATH)
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
- if (MPI_C_LINK_FLAGS)
- if (${MPI_C_LINK_FLAGS} MATCHES " -")
- string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
- endif()
- 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()
# THREADS
--
GitLab