diff --git a/Modules/Simulation/CMakeLists.txt b/Modules/Simulation/CMakeLists.txt
index c38a60619d..f21ba24403 100644
--- a/Modules/Simulation/CMakeLists.txt
+++ b/Modules/Simulation/CMakeLists.txt
@@ -1,11 +1,8 @@
-if(MITK_USE_SOFA)
-  MITK_CREATE_MODULE(
-    DEPENDS MitkSceneSerializationBase
-    PACKAGE_DEPENDS Boost GLUT GLEW SOFA
-  )
+MITK_CREATE_MODULE(
+  DEPENDS MitkLegacyGL MitkSceneSerializationBase
+  PACKAGE_DEPENDS Boost GLUT GLEW SOFA
+)
 
-  if(MSVC)
-    list(APPEND module_compile_flags /wd4068 4250 4251 4267 4275)
-    set_target_properties(${MODULE_TARGET} PROPERTIES COMPILE_FLAGS "${module_compile_flags}")
-  endif()
+if(MITK_USE_SOFA AND MSVC)
+  set_property(TARGET ${MODULE_TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " /wd4068 /wd4250 /wd4251 /wd4267 /wd4275")
 endif()
diff --git a/Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt b/Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt
index 12c8c7349f..b0b840c0e0 100644
--- a/Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt
@@ -1,11 +1,11 @@
 project(org_mitk_gui_qt_simulation)
 
 MACRO_CREATE_MITK_CTK_PLUGIN(
   EXPORT_DIRECTIVE SIMULATION_EXPORT
   EXPORTED_INCLUDE_SUFFIXES src
   MODULE_DEPENDS MitkQtWidgets MitkSimulation
 )
 
 if(MSVC)
-  set_property(TARGET ${PLUGIN_TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " /wd4250 /wd4251 /wd4267 /wd4275")
+  set_property(TARGET ${PLUGIN_TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " /wd4068 /wd4250 /wd4251 /wd4267 /wd4275")
 endif()
\ No newline at end of file