diff --git a/CMake/CMakeSetCompilerFlags.cmake b/CMake/CMakeSetCompilerFlags.cmake
index b00a17fdb216f60bebca87b8f408ddf6e894c629..4165eeff8b8cce1e89d19beffefe7507496fee49 100644
--- a/CMake/CMakeSetCompilerFlags.cmake
+++ b/CMake/CMakeSetCompilerFlags.cmake
@@ -20,7 +20,7 @@ macro(loadMachineFile)
     SET(CMAKE_CONFIG_FILE "${VF_CMAKE_DIR}/cmake_config_files/${CAB_MACHINE}.config.cmake")
 
     IF(NOT EXISTS ${CMAKE_CONFIG_FILE})
-        status("No configuration file found.")
+        status("No configuration file found for machine: ${CAB_MACHINE}.")
     ELSE()
         status("Load configuration file ${CAB_MACHINE}.config.cmake")
         include(${CMAKE_CONFIG_FILE})
diff --git a/apps/gpu/LBM/DrivenCavity/CMakeLists.txt b/apps/gpu/LBM/DrivenCavity/CMakeLists.txt
index e170d772bded31bb0f333dc7519ff434ec91e313..3c401265dc43f0900094638280c5229894138c64 100644
--- a/apps/gpu/LBM/DrivenCavity/CMakeLists.txt
+++ b/apps/gpu/LBM/DrivenCavity/CMakeLists.txt
@@ -4,4 +4,6 @@ PROJECT(DrivenCavity)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluids_GPU basics GridGenerator FILES DrivenCavity.cpp )
 
+set_source_files_properties(DrivenCavity.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()
diff --git a/apps/gpu/LBM/TGV_3D/CMakeLists.txt b/apps/gpu/LBM/TGV_3D/CMakeLists.txt
index a8018feeb7c79d0d07c5788e31f03769ebb9ffa9..82e62a2e35dc7be39b52d164baa6c1fc0f081daa 100644
--- a/apps/gpu/LBM/TGV_3D/CMakeLists.txt
+++ b/apps/gpu/LBM/TGV_3D/CMakeLists.txt
@@ -2,4 +2,6 @@ PROJECT(TGV_3D)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES TGV_3D.cpp)
 
+set_source_files_properties(TGV_3D.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()
diff --git a/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt b/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt
index 5fbef792d1385e46a99aa0da4b274233959e0b1e..ef91ada689729ae3b74d7e0ef9536ac7aed2bb9a 100644
--- a/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt
+++ b/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt
@@ -2,4 +2,6 @@ PROJECT(TGV_3D_MultiGPU)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES TGV_3D_MultiGPU.cpp)
 
+set_source_files_properties(TGV_3D_MultiGPU.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()
diff --git a/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt b/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
index 636870f1d809ac8e92f4017ffe8bad828075a8d8..b05d36ee5a0d47a21ee5b96fb4fbb2cb0485ae38 100644
--- a/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
+++ b/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
@@ -2,4 +2,6 @@ PROJECT(GridGeneratorTest)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES gridGenerator.cpp)
 
+set_source_files_properties(gridGenerator.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()
diff --git a/cpu.cmake b/cpu.cmake
index 7e90d1b54732407e9716bada7b9460544ff0a74c..e9b33c18e665262bdfbfe3a32d377463e6e922ee 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -82,11 +82,11 @@ endif()
 
 
 add_subdirectory(${VF_THIRD_DIR}/MuParser)
-add_subdirectory(${VF_THIRD_DIR}/pybind11/pybind11-2.5.0)
 
 add_subdirectory(src/cpu/VirtualFluidsCore)
 
 if(BUILD_VF_PYTHON_BINDINGS)
+    add_subdirectory(${VF_THIRD_DIR}/pybind11/pybind11-2.5.0)
     add_subdirectory(src/cpu/simulationconfig)
     add_subdirectory(src/cpu/pythonbindings)
 endif()