Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit e2ae6bcd authored by Florent Pruvost's avatar Florent Pruvost
Browse files

consider MPI_C_LINK_FLAGS as CMAKE_REQUIRED_FLAGS during linking tests

parent f5d468cc
...@@ -502,6 +502,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND ) ...@@ -502,6 +502,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
set(REQUIRED_INCDIRS) set(REQUIRED_INCDIRS)
set(REQUIRED_LIBDIRS) set(REQUIRED_LIBDIRS)
set(REQUIRED_LIBS) set(REQUIRED_LIBS)
set(REQUIRED_FLAGS)
# CHAMELEON # CHAMELEON
if (CHAMELEON_INCLUDE_DIRS) if (CHAMELEON_INCLUDE_DIRS)
...@@ -597,7 +598,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND ) ...@@ -597,7 +598,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}") list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif() endif()
if (MPI_C_LINK_FLAGS) if (MPI_C_LINK_FLAGS)
list(APPEND REQUIRED_LIBS "${MPI_C_LINK_FLAGS}") list(APPEND REQUIRED_FLAGS "${MPI_C_LINK_FLAGS}")
endif() endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
endif() endif()
...@@ -683,6 +684,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND ) ...@@ -683,6 +684,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}") list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach() endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}") list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
# test link # test link
unset(CHAMELEON_WORKS CACHE) unset(CHAMELEON_WORKS CACHE)
...@@ -692,7 +694,11 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND ) ...@@ -692,7 +694,11 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
if(CHAMELEON_WORKS) if(CHAMELEON_WORKS)
# save link with dependencies # save link with dependencies
set(CHAMELEON_LIBRARIES_DEP "${REQUIRED_LIBS}") if (REQUIRED_FLAGS)
set(CHAMELEON_LIBRARIES_DEP "${REQUIRED_FLAGS};${REQUIRED_LIBS}")
else()
set(CHAMELEON_LIBRARIES_DEP "${REQUIRED_LIBS}")
endif()
set(CHAMELEON_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}") set(CHAMELEON_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}")
set(CHAMELEON_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}") set(CHAMELEON_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}")
else() else()
......
...@@ -464,6 +464,7 @@ if(PASTIX_LIBRARIES) ...@@ -464,6 +464,7 @@ if(PASTIX_LIBRARIES)
set(REQUIRED_INCDIRS) set(REQUIRED_INCDIRS)
set(REQUIRED_LIBDIRS) set(REQUIRED_LIBDIRS)
set(REQUIRED_LIBS) set(REQUIRED_LIBS)
set(REQUIRED_FLAGS)
# PASTIX # PASTIX
if (PASTIX_INCLUDE_DIRS) if (PASTIX_INCLUDE_DIRS)
...@@ -505,7 +506,7 @@ if(PASTIX_LIBRARIES) ...@@ -505,7 +506,7 @@ if(PASTIX_LIBRARIES)
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}") list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif() endif()
if (MPI_C_LINK_FLAGS) if (MPI_C_LINK_FLAGS)
list(APPEND REQUIRED_LIBS "${MPI_C_LINK_FLAGS}") list(APPEND REQUIRED_FLAGS "${MPI_C_LINK_FLAGS}")
endif() endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
endif() endif()
...@@ -585,6 +586,7 @@ if(PASTIX_LIBRARIES) ...@@ -585,6 +586,7 @@ if(PASTIX_LIBRARIES)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}") list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach() endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}") list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
# test link # test link
unset(PASTIX_WORKS CACHE) unset(PASTIX_WORKS CACHE)
...@@ -594,7 +596,11 @@ if(PASTIX_LIBRARIES) ...@@ -594,7 +596,11 @@ if(PASTIX_LIBRARIES)
if(PASTIX_WORKS) if(PASTIX_WORKS)
# save link with dependencies # save link with dependencies
set(PASTIX_LIBRARIES_DEP "${REQUIRED_LIBS}") if (REQUIRED_FLAGS)
set(PASTIX_LIBRARIES_DEP "${REQUIRED_FLAGS};${REQUIRED_LIBS}")
else()
set(PASTIX_LIBRARIES_DEP "${REQUIRED_LIBS}")
endif()
set(PASTIX_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}") set(PASTIX_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}")
set(PASTIX_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}") set(PASTIX_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}")
else() else()
......
...@@ -215,6 +215,7 @@ if(PTSCOTCH_LIBRARIES) ...@@ -215,6 +215,7 @@ if(PTSCOTCH_LIBRARIES)
set(REQUIRED_INCDIRS) set(REQUIRED_INCDIRS)
set(REQUIRED_LIBDIRS) set(REQUIRED_LIBDIRS)
set(REQUIRED_LIBS) set(REQUIRED_LIBS)
set(REQUIRED_FLAGS)
# PTSCOTCH # PTSCOTCH
if (PTSCOTCH_INCLUDE_DIRS) if (PTSCOTCH_INCLUDE_DIRS)
...@@ -230,7 +231,7 @@ if(PTSCOTCH_LIBRARIES) ...@@ -230,7 +231,7 @@ if(PTSCOTCH_LIBRARIES)
list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}") list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}")
endif() endif()
if (MPI_C_LINK_FLAGS) if (MPI_C_LINK_FLAGS)
list(APPEND REQUIRED_LIBS "${MPI_C_LINK_FLAGS}") list(APPEND REQUIRED_FLAGS "${MPI_C_LINK_FLAGS}")
endif() endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
endif() endif()
...@@ -246,6 +247,7 @@ if(PTSCOTCH_LIBRARIES) ...@@ -246,6 +247,7 @@ if(PTSCOTCH_LIBRARIES)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}") list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach() endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}") list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
# test link # test link
unset(PTSCOTCH_WORKS CACHE) unset(PTSCOTCH_WORKS CACHE)
...@@ -255,7 +257,11 @@ if(PTSCOTCH_LIBRARIES) ...@@ -255,7 +257,11 @@ if(PTSCOTCH_LIBRARIES)
if(PTSCOTCH_WORKS) if(PTSCOTCH_WORKS)
# save link with dependencies # save link with dependencies
set(PTSCOTCH_LIBRARIES_DEP "${REQUIRED_LIBS}") if (REQUIRED_FLAGS)
set(PTSCOTCH_LIBRARIES_DEP "${REQUIRED_FLAGS};${REQUIRED_LIBS}")
else()
set(PTSCOTCH_LIBRARIES_DEP "${REQUIRED_LIBS}")
endif()
set(PTSCOTCH_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}") set(PTSCOTCH_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}")
set(PTSCOTCH_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}") set(PTSCOTCH_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}")
else() else()
......
...@@ -606,6 +606,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR ...@@ -606,6 +606,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
set(REQUIRED_INCDIRS) set(REQUIRED_INCDIRS)
set(REQUIRED_LIBDIRS) set(REQUIRED_LIBDIRS)
set(REQUIRED_LIBS) set(REQUIRED_LIBS)
set(REQUIRED_FLAGS)
# STARPU # STARPU
if (STARPU_INCLUDE_DIRS) if (STARPU_INCLUDE_DIRS)
...@@ -640,7 +641,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR ...@@ -640,7 +641,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}") list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif() endif()
if (MPI_C_LINK_FLAGS) if (MPI_C_LINK_FLAGS)
list(APPEND REQUIRED_LIBS "${MPI_C_LINK_FLAGS}") list(APPEND REQUIRED_FLAGS "${MPI_C_LINK_FLAGS}")
endif() endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}") list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
endif() endif()
...@@ -718,6 +719,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR ...@@ -718,6 +719,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}") list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach() endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}") list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
# test link # test link
unset(STARPU_WORKS CACHE) unset(STARPU_WORKS CACHE)
...@@ -727,7 +729,11 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR ...@@ -727,7 +729,11 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
if(STARPU_WORKS) if(STARPU_WORKS)
# save link with dependencies # save link with dependencies
set(STARPU_LIBRARIES_DEP "${REQUIRED_LIBS}") if (REQUIRED_FLAGS)
set(STARPU_LIBRARIES_DEP "${REQUIRED_FLAGS};${REQUIRED_LIBS}")
else()
set(STARPU_LIBRARIES_DEP "${REQUIRED_LIBS}")
endif()
set(STARPU_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}") set(STARPU_LIBRARY_DIRS_DEP "${REQUIRED_LIBDIRS}")
set(STARPU_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}") set(STARPU_INCLUDE_DIRS_DEP "${REQUIRED_INCDIRS}")
else() else()
......
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