diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca71fb23be0c1790b377165e8df820de94398792..ba98290c48f4a0426720636d72e6756f552f6b0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ build_openmp:
       - build
       - chameleon_openmp.log
   variables:
-    BUILD_OPTIONS: "-DCHAMELEON_SCHED_OPENMP=ON -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"
+    BUILD_OPTIONS: "-DCHAMELEON_SCHED_OPENMP=ON"
     VERSION: openmp
 
 test_starpu_branches:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b0d295a141fcb5058ce39a7c157984bf31616a0..b9ddfa195420d1b064be7caeb3ee8a93383f830f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,6 @@ if ( CHAMELEON_SCHED_PARSEC OR CHAMELEON_SCHED_STARPU )
      set(CHAMELEON_ENABLE_MPI ON FORCE)
 endif()
 
-# FIXME: with OpenMP-target we should enable CUDA too
 # Use intermediate variable since cmake_dependent_option doesn't have OR conditions
 set(CHAMELEON_ENABLE_CUDA OFF CACHE INTERNAL "Tells if CUDA might be supported by the runtime")
 if ( CHAMELEON_SCHED_PARSEC OR CHAMELEON_SCHED_STARPU )