From b7d72817cb45d8100daf8db7b0643bcb17fb520a Mon Sep 17 00:00:00 2001 From: Florent Pruvost <florent.pruvost@inria.fr> Date: Thu, 10 Dec 2015 09:53:14 +0000 Subject: [PATCH] refix the problem of starpu mpi function detection - with the complete path of mpi libraries the test fails... with -L/... and -l it succeeds --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 560ffbc8d..58f346f2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -631,11 +631,12 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/") list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}") list(APPEND CMAKE_REQUIRED_FLAGS "${MPI_C_LINK_FLAGS}") set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP}") -# if (CHAMELEON_SIMULATION) -# set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP}") -# else() -# set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP} -lmpi") -# endif() + list(APPEND CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}") + if (CHAMELEON_SIMULATION) + set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP}") + else() + set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP} -lmpi") + endif() unset(STARPU_MPI_DATA_REGISTER_FOUND CACHE) check_function_exists(starpu_mpi_data_register_comm STARPU_MPI_DATA_REGISTER_FOUND) if ( STARPU_MPI_DATA_REGISTER_FOUND ) -- GitLab