Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 27e1a9e7 authored by PRUVOST Florent's avatar PRUVOST Florent
Browse files

update cmake_modules from morse_distrib/

parent 58c45370
No related branches found
No related tags found
No related merge requests found
...@@ -611,7 +611,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND ) ...@@ -611,7 +611,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
list(APPEND REQUIRED_LIBDIRS "${libdir}") list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif() endif()
endforeach() endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${HWLOC_LIBRARIES}") foreach(lib ${HWLOC_LIBRARIES})
if (EXISTS ${lib} OR ${lib} MATCHES "^-")
list(APPEND REQUIRED_LIBS "${lib}")
else()
list(APPEND REQUIRED_LIBS "-l${lib}")
endif()
endforeach()
endif() endif()
# TMG # TMG
if (TMG_FOUND) if (TMG_FOUND)
......
...@@ -519,7 +519,13 @@ if(PASTIX_LIBRARIES) ...@@ -519,7 +519,13 @@ if(PASTIX_LIBRARIES)
list(APPEND REQUIRED_LIBDIRS "${libdir}") list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif() endif()
endforeach() endforeach()
list(APPEND REQUIRED_LIBS "${HWLOC_LIBRARIES}") foreach(lib ${HWLOC_LIBRARIES})
if (EXISTS ${lib} OR ${lib} MATCHES "^-")
list(APPEND REQUIRED_LIBS "${lib}")
else()
list(APPEND REQUIRED_LIBS "-l${lib}")
endif()
endforeach()
endif() endif()
# BLAS # BLAS
if (BLAS_FOUND) if (BLAS_FOUND)
...@@ -569,12 +575,6 @@ if(PASTIX_LIBRARIES) ...@@ -569,12 +575,6 @@ if(PASTIX_LIBRARIES)
endforeach() endforeach()
list(APPEND REQUIRED_LIBS "${METIS_LIBRARIES}") list(APPEND REQUIRED_LIBS "${METIS_LIBRARIES}")
endif() endif()
# Fortran
if (CMAKE_Fortran_COMPILER MATCHES ".+gfortran.*")
list(APPEND REQUIRED_LIBS "-lgfortran")
elseif (CMAKE_Fortran_COMPILER MATCHES ".+ifort.*")
list(APPEND REQUIRED_LIBS "-lifcore")
endif()
# EXTRA LIBS such that pthread, m, rt # EXTRA LIBS such that pthread, m, rt
list(APPEND REQUIRED_LIBS ${PASTIX_EXTRA_LIBRARIES}) list(APPEND REQUIRED_LIBS ${PASTIX_EXTRA_LIBRARIES})
......
...@@ -234,7 +234,6 @@ if(PTSCOTCH_LIBRARIES) ...@@ -234,7 +234,6 @@ if(PTSCOTCH_LIBRARIES)
endif() endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
endif() endif()
endif()
# THREADS # THREADS
if(CMAKE_THREAD_LIBS_INIT) if(CMAKE_THREAD_LIBS_INIT)
list(APPEND REQUIRED_LIBS "${CMAKE_THREAD_LIBS_INIT}") list(APPEND REQUIRED_LIBS "${CMAKE_THREAD_LIBS_INIT}")
......
...@@ -235,7 +235,13 @@ if(QUARK_LIBRARIES) ...@@ -235,7 +235,13 @@ if(QUARK_LIBRARIES)
if (HWLOC_LIBRARY_DIRS) if (HWLOC_LIBRARY_DIRS)
list(APPEND REQUIRED_LIBDIRS "${HWLOC_LIBRARY_DIRS}") list(APPEND REQUIRED_LIBDIRS "${HWLOC_LIBRARY_DIRS}")
endif() endif()
list(APPEND REQUIRED_LIBS "${HWLOC_LIBRARIES}") foreach(lib ${HWLOC_LIBRARIES})
if (EXISTS ${lib} OR ${lib} MATCHES "^-")
list(APPEND REQUIRED_LIBS "${lib}")
else()
list(APPEND REQUIRED_LIBS "-l${lib}")
endif()
endforeach()
endif() endif()
# THREADS # THREADS
list(APPEND REQUIRED_LIBS "${CMAKE_THREAD_LIBS_INIT}") list(APPEND REQUIRED_LIBS "${CMAKE_THREAD_LIBS_INIT}")
......
...@@ -626,7 +626,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR ...@@ -626,7 +626,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
if (HWLOC_LIBRARY_DIRS) if (HWLOC_LIBRARY_DIRS)
list(APPEND REQUIRED_LIBDIRS "${HWLOC_LIBRARY_DIRS}") list(APPEND REQUIRED_LIBDIRS "${HWLOC_LIBRARY_DIRS}")
endif() endif()
list(APPEND REQUIRED_LIBS "${HWLOC_LIBRARIES}") foreach(lib ${HWLOC_LIBRARIES})
if (EXISTS ${lib} OR ${lib} MATCHES "^-")
list(APPEND REQUIRED_LIBS "${lib}")
else()
list(APPEND REQUIRED_LIBS "-l${lib}")
endif()
endforeach()
endif() endif()
# MPI # MPI
if (MPI_FOUND AND STARPU_LOOK_FOR_MPI) if (MPI_FOUND AND STARPU_LOOK_FOR_MPI)
...@@ -680,7 +686,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR ...@@ -680,7 +686,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
if (FXT_LIBRARY_DIRS) if (FXT_LIBRARY_DIRS)
list(APPEND REQUIRED_LIBDIRS "${FXT_LIBRARY_DIRS}") list(APPEND REQUIRED_LIBDIRS "${FXT_LIBRARY_DIRS}")
endif() endif()
list(APPEND REQUIRED_LIBS "${FXT_LIBRARIES}") foreach(lib ${FXT_LIBRARIES})
if (EXISTS ${lib} OR ${lib} MATCHES "^-")
list(APPEND REQUIRED_LIBS "${lib}")
else()
list(APPEND REQUIRED_LIBS "-l${lib}")
endif()
endforeach()
endif() endif()
# BLAS # BLAS
if (BLAS_FOUND AND STARPU_LOOK_FOR_BLAS) if (BLAS_FOUND AND STARPU_LOOK_FOR_BLAS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment