diff --git a/CMakeLists.txt b/CMakeLists.txt
index d07d16a89ca313cddd3d4558f065495b24970385..5146e0cdc29700e3ada443840158ef607da83a5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,37 +378,12 @@ if(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_c
   CMAKE_DEPENDENT_OPTION( SCALFMM_USE_CUDA "Set to ON to use OPENCL with StarPU" OFF "SCALFMM_USE_STARPU" OFF)
   if( SCALFMM_USE_STARPU )
     enable_language(C)
-    # CUDA could be used with StarPU enabled
-    option( SCALFMM_USE_CUDA "Set to ON to use CUDA with StarPU" OFF )
-    #if(SCALFMM_USE_CUDA)
-    #  execute_process(COMMAND nvcc --version ERROR_VARIABLE cuda_error_output OUTPUT_QUIET)
-    #  if(cuda_error_output)
-    #    message( FATAL_ERROR "nvcc is needed with CUDA." )
-    #  endif()
-    #  if(NOT DEFINED CUSTOM_CUDA_FLAGS)
-    #    set( CUSTOM_CUDA_FLAGS "-std=c++11;-arch=sm_20;--ptxas-options=-v;-use_fast_math" CACHE
-    #      STRING "Set your CUDA flags, for example : -arch=sm_20;--ptxas-options=-v;-use_fast_math")
-    #  endif()
-    #  # This is needed to remove backslash after space in ADD_CUSTOM_COMMAND
-    #  separate_arguments(CUSTOM_CUDA_FLAGS)
-    #  message( STATUS "CUSTOM_CUDA_FLAGS             = ${CUSTOM_CUDA_FLAGS}" )
-    #  find_package(CUDA REQUIRED)
-
-    #  if (CUDA_INCLUDE_DIRS)
-    #    include_directories(${CUDA_INCLUDE_DIRS})
-    #  endif()
-    #  if (CUDA_LIBRARIES)
-    #    set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES};${CUDA_LIBRARIES}")
-    #  endif()
-
-    #  set(CUDA_NEEDED_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/Src)
-    #endif()
-
     # Find StarPU with a list of optional components
     set(SCALFMM_STARPU_VERSION "1.2.8" CACHE STRING " STARPU version desired")
     # create list of components in order to make a single call to find_package(starpu...)
     set(STARPU_COMPONENT_LIST "HWLOC")
     if(SCALFMM_USE_CUDA)
+      message(WARNING "This release doest not include a full support for CUDA/OpenCl.")
       list(APPEND STARPU_COMPONENT_LIST "CUDA")
     endif()
     list(APPEND FUSE_LIST "CUDA")
@@ -416,6 +391,7 @@ if(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_c
       list(APPEND STARPU_COMPONENT_LIST "MPI")
     endif()
     if(SCALFMM_USE_OPENCL)
+      message(WARNING "This release doest not include a full support for CUDA/OpenCl.")
       list(APPEND STARPU_COMPONENT_LIST "OPENCL")
     endif()
     list(APPEND FUSE_LIST "OPENCL")