diff --git a/CMakeLists.txt b/CMakeLists.txt
index 560ffbc8daacf9a8a50637c402032a4e8d3c1599..58f346f2a3a764025630704cbc61adbff4d9ff50 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 )