From 583096a90e426a4d93339a5bb6e90a22900bc40e Mon Sep 17 00:00:00 2001 From: Florent Pruvost <florent.pruvost@inria.fr> Date: Fri, 6 Feb 2015 16:09:55 +0000 Subject: [PATCH] add includes of MPI in some Finds - add include path as hints in chameleon and starpu --- cmake_modules/morse/find/FindCHAMELEON.cmake | 5 ++++- cmake_modules/morse/find/FindPTSCOTCH.cmake | 3 +++ cmake_modules/morse/find/FindSTARPU.cmake | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cmake_modules/morse/find/FindCHAMELEON.cmake b/cmake_modules/morse/find/FindCHAMELEON.cmake index c4bab85f0..98abd1387 100644 --- a/cmake_modules/morse/find/FindCHAMELEON.cmake +++ b/cmake_modules/morse/find/FindCHAMELEON.cmake @@ -344,7 +344,7 @@ if(NOT CHAMELEON_FOUND OR NOT CHAMELEON_LIBRARIES) find_path(CHAMELEON_morse.h_DIRS NAMES morse.h HINTS ${CHAMELEON_DIR} - PATH_SUFFIXES include/chameleon) + PATH_SUFFIXES "include" "include/chameleon") else() set(CHAMELEON_morse.h_DIRS "CHAMELEON_morse.h_DIRS-NOTFOUND") find_path(CHAMELEON_morse.h_DIRS @@ -499,6 +499,9 @@ if(NOT CHAMELEON_FOUND OR NOT CHAMELEON_LIBRARIES) list(APPEND CMAKE_REQUIRED_LIBRARIES "${${MAGMA_LIBRARIES}}") endif() if (MPI_FOUND) + if (MPI_C_INCLUDE_PATH) + list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}") + endif() list(APPEND CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}") endif() if (HWLOC_FOUND) diff --git a/cmake_modules/morse/find/FindPTSCOTCH.cmake b/cmake_modules/morse/find/FindPTSCOTCH.cmake index f8dca7c96..edda37090 100644 --- a/cmake_modules/morse/find/FindPTSCOTCH.cmake +++ b/cmake_modules/morse/find/FindPTSCOTCH.cmake @@ -234,6 +234,9 @@ if(PTSCOTCH_LIBRARIES) set(CMAKE_REQUIRED_FLAGS "-L${PTSCOTCH_LIBRARY_DIRS}") endif() if (MPI_FOUND) + if (MPI_C_INCLUDE_PATH) + list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}") + endif() list(APPEND CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}") endif() diff --git a/cmake_modules/morse/find/FindSTARPU.cmake b/cmake_modules/morse/find/FindSTARPU.cmake index 1aadecbe1..4de459a6b 100644 --- a/cmake_modules/morse/find/FindSTARPU.cmake +++ b/cmake_modules/morse/find/FindSTARPU.cmake @@ -233,7 +233,11 @@ if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR find_path(STARPU_${starpu_hdr}_INCLUDE_DIRS NAMES ${starpu_hdr} HINTS ${STARPU_DIR} - PATH_SUFFIXES "include/starpu/1.0" "include/starpu/1.1" "include/starpu/1.2") + PATH_SUFFIXES "include" + "include/starpu/1.0" + "include/starpu/1.1" + "include/starpu/1.2" + "include/starpu/1.3") endforeach() else() foreach(starpu_hdr ${STARPU_hdrs_to_find}) @@ -572,6 +576,9 @@ if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR list(APPEND CMAKE_REQUIRED_LIBRARIES "${HWLOC_LIBRARIES}") endif() if (MPI_FOUND) + if (MPI_C_INCLUDE_PATH) + list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}") + endif() list(APPEND CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}") endif() if (CUDA_FOUND) -- GitLab