diff --git a/CMake/FileUtilities.cmake b/CMake/FileUtilities.cmake
index 604e6fe42d1acff91dc80f7d8d40c73704b2deb8..23e256dfd85b91b1980d168c676ef6a1d2b758ea 100644
--- a/CMake/FileUtilities.cmake
+++ b/CMake/FileUtilities.cmake
@@ -42,7 +42,7 @@ macro(includeFiles targetName file_paths)
 
 		collectFilesFrom(${file})
 		if (package_dir)
-		   setSourceGroupForFilesIn(${package_dir} ${targetName})
+		   setSourceGroupForFilesIn(${file} ${package_dir} ${targetName})
 		endif()
 
 	endforeach()
@@ -72,14 +72,14 @@ endmacro()
 
 
 
-macro(setSourceGroupForFilesIn package_dir targetName)
+macro(setSourceGroupForFilesIn file package_dir targetName)
 #input: target_name PACKAGE_SRCS
 	buildSourceGroup(${targetName} ${package_dir})
 
 	if(isAllTestSuite)
-		source_group(${targetName}\\${SOURCE_GROUP} FILES ${MY_SRCS})
+		source_group(${targetName}\\${SOURCE_GROUP} FILES ${file})
 	else()
-		source_group(${SOURCE_GROUP} FILES ${MY_SRCS})
+		source_group(${SOURCE_GROUP} FILES ${file})
 	endif()
 #output: -
 endmacro(setSourceGroupForFilesIn)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65ef677b7fdbbfe60a245595802721ed5bd982cc..f031956ba8df35bb980a2971c3514f1d19b7809d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,10 +48,10 @@ add_subdirectory(src/basics)
 #################################################################################
 #  VIRTUAL FLUIDS CPU / GPU
 #################################################################################
-#if (BUILD_VF_CPU)
+if (BUILD_VF_CPU)
     include (cpu.cmake)
-#endif()
-#if(BUILD_VF_GPU)
+endif()
+if(BUILD_VF_GPU)
     include (gpu.cmake)
-#endif()
+endif()