diff --git a/compute/CMakeLists.txt b/compute/CMakeLists.txt
index 229ff810285560c6a0cb1ea486e11d61083eb5fb..8d8fe14aedff319d6c3473ea0ae614d4372f7fea 100644
--- a/compute/CMakeLists.txt
+++ b/compute/CMakeLists.txt
@@ -26,15 +26,20 @@
 #
 ###
 
-option(CHAMELEON_COPY_DIAG
-  "This options enables the duplication of the diagonal tiles in some algorithm to avoid anti-dependencies on lower/upper triangular parts (Might be useful to StarPU)" ON)
-mark_as_advanced(CHAMELEON_COPY_DIAG)
+if ( CHAMELEON_USE_CUDA )
+  set( CHAMELEON_COPY_DIAG ON )
+else()
+  option(CHAMELEON_COPY_DIAG
+    "This options enables the duplication of the diagonal tiles in some algorithm to avoid anti-dependencies on lower/upper triangular parts (Might be useful to StarPU)" ON)
+endif()
 
 if ( CHAMELEON_SCHED_QUARK )
   # No need for those extra diagonale tiles
   set( CHAMELEON_COPY_DIAG OFF )
 endif()
 
+mark_as_advanced(CHAMELEON_COPY_DIAG)
+
 if (CHAMELEON_COPY_DIAG)
   add_definitions(-DCHAMELEON_COPY_DIAG)
 endif()