diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1137f6387f88983cfc3c9190e78a93447d7fe3ef..228d03a890b1e57e891c2211e9132a287971ee54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -560,13 +560,13 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
         # create list of components in order to make a single call to find_package(starpu...)
         if(NOT CHAMELEON_SIMULATION)
             set(STARPU_COMPONENT_LIST "HWLOC")
-            if(CHAMELEON_USE_MPI)
-                list(APPEND STARPU_COMPONENT_LIST "MPI")
-            endif()
             if(CHAMELEON_USE_CUDA)
                 list(APPEND STARPU_COMPONENT_LIST "CUDA")
             endif()
         endif()
+        if(CHAMELEON_USE_MPI)
+            list(APPEND STARPU_COMPONENT_LIST "MPI")
+        endif()
         if(CHAMELEON_ENABLE_TRACING)
             list(APPEND STARPU_COMPONENT_LIST "FXT")
         endif()