From 27e1a9e7ddc4516573a04f9366c10ff45a7560e3 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Fri, 20 Feb 2015 17:05:30 +0000
Subject: [PATCH] update cmake_modules from morse_distrib/
---
cmake_modules/morse/find/FindCHAMELEON.cmake | 8 +++++++-
cmake_modules/morse/find/FindPASTIX.cmake | 14 +++++++-------
cmake_modules/morse/find/FindPTSCOTCH.cmake | 1 -
cmake_modules/morse/find/FindQUARK.cmake | 8 +++++++-
cmake_modules/morse/find/FindSTARPU.cmake | 16 ++++++++++++++--
5 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/cmake_modules/morse/find/FindCHAMELEON.cmake b/cmake_modules/morse/find/FindCHAMELEON.cmake
index 9aa16decd..383535110 100644
--- a/cmake_modules/morse/find/FindCHAMELEON.cmake
+++ b/cmake_modules/morse/find/FindCHAMELEON.cmake
@@ -611,7 +611,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
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()
# TMG
if (TMG_FOUND)
diff --git a/cmake_modules/morse/find/FindPASTIX.cmake b/cmake_modules/morse/find/FindPASTIX.cmake
index d5f33e8a8..bbaab381d 100644
--- a/cmake_modules/morse/find/FindPASTIX.cmake
+++ b/cmake_modules/morse/find/FindPASTIX.cmake
@@ -519,7 +519,13 @@ if(PASTIX_LIBRARIES)
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
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()
# BLAS
if (BLAS_FOUND)
@@ -569,12 +575,6 @@ if(PASTIX_LIBRARIES)
endforeach()
list(APPEND REQUIRED_LIBS "${METIS_LIBRARIES}")
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
list(APPEND REQUIRED_LIBS ${PASTIX_EXTRA_LIBRARIES})
diff --git a/cmake_modules/morse/find/FindPTSCOTCH.cmake b/cmake_modules/morse/find/FindPTSCOTCH.cmake
index 48feec169..cfeae5344 100644
--- a/cmake_modules/morse/find/FindPTSCOTCH.cmake
+++ b/cmake_modules/morse/find/FindPTSCOTCH.cmake
@@ -234,7 +234,6 @@ if(PTSCOTCH_LIBRARIES)
endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
endif()
- endif()
# THREADS
if(CMAKE_THREAD_LIBS_INIT)
list(APPEND REQUIRED_LIBS "${CMAKE_THREAD_LIBS_INIT}")
diff --git a/cmake_modules/morse/find/FindQUARK.cmake b/cmake_modules/morse/find/FindQUARK.cmake
index 1735879de..306fc0339 100644
--- a/cmake_modules/morse/find/FindQUARK.cmake
+++ b/cmake_modules/morse/find/FindQUARK.cmake
@@ -235,7 +235,13 @@ if(QUARK_LIBRARIES)
if (HWLOC_LIBRARY_DIRS)
list(APPEND REQUIRED_LIBDIRS "${HWLOC_LIBRARY_DIRS}")
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()
# THREADS
list(APPEND REQUIRED_LIBS "${CMAKE_THREAD_LIBS_INIT}")
diff --git a/cmake_modules/morse/find/FindSTARPU.cmake b/cmake_modules/morse/find/FindSTARPU.cmake
index 89a36bc19..66f0f6c80 100644
--- a/cmake_modules/morse/find/FindSTARPU.cmake
+++ b/cmake_modules/morse/find/FindSTARPU.cmake
@@ -626,7 +626,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
if (HWLOC_LIBRARY_DIRS)
list(APPEND REQUIRED_LIBDIRS "${HWLOC_LIBRARY_DIRS}")
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()
# MPI
if (MPI_FOUND AND STARPU_LOOK_FOR_MPI)
@@ -680,7 +686,13 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
if (FXT_LIBRARY_DIRS)
list(APPEND REQUIRED_LIBDIRS "${FXT_LIBRARY_DIRS}")
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()
# BLAS
if (BLAS_FOUND AND STARPU_LOOK_FOR_BLAS)
--
GitLab