diff --git a/cmake/waLBerlaFunctions.cmake b/cmake/waLBerlaFunctions.cmake
index da1b0b20d205306a1b0a3fcaf63f0e44f6561a97..861496568c86a6f4a0ee6d029b8aa8f1d60c1845 100644
--- a/cmake/waLBerlaFunctions.cmake
+++ b/cmake/waLBerlaFunctions.cmake
@@ -218,11 +218,10 @@ function ( waLBerla_add_executable )
         return()
     endif()
 
-
-    if ( CUDA_FOUND )
-        cuda_add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles} ${generatorSourceFiles} )
+    if ( WALBERLA_BUILD_WITH_CUDA )
+        cuda_add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles} )
     else()
-        add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles} ${generatorSourceFiles} )
+        add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles}  )
     endif()
 
     set_source_files_properties( ${generatedSourceFiles} PROPERTIES GENERATED TRUE )