diff --git a/src/mdl/jit/llvm/CMakeLists.txt b/src/mdl/jit/llvm/CMakeLists.txt
index 70f7f50..13857be 100644
--- a/src/mdl/jit/llvm/CMakeLists.txt
+++ b/src/mdl/jit/llvm/CMakeLists.txt
@@ -289,11 +289,16 @@ endforeach()
 
 # -------------------------------------------------------------------------------------------------
 # set options for all other projects that are build in addition to the libs we need
-set(ADDITIONAL_LLVM_TARGETS 
-    obj.llvm-tblgen
-    llvm-tblgen 
+set(ADDITIONAL_LLVM_TARGETS
+    llvm-tblgen
     )
 
+
+# LLVM_ENABLE_OBJLIB cf. dist\cmake\modules\TableGen.cmake:125
+if(NOT (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT CMAKE_VERSION VERSION_LESS 3.9) AND NOT XCODE)
+  list(APPEND ADDITIONAL_LLVM_TARGETS obj.llvm-tblgen)
+endif()
+
 foreach(_ADD_LLVM ${ADDITIONAL_LLVM_TARGETS})
     message(STATUS "setting flags for ${_ADD_LLVM}")
     llvm_target_setup(TARGET ${_ADD_LLVM})
@@ -360,9 +365,10 @@ if(WINDOWS)
             )
     endif()
 
-    set(_LLVM_EXCLUDE ${_LLVM_EXCLUDE} 
-        LLVMVisualizers
-        )
+    # LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION cf. dist\CMakeLists.txt:559
+    if (MSVC_IDE AND NOT (MSVC_VERSION LESS 1900))
+      list(APPEND _LLVM_EXCLUDE LLVMVisualizers)
+    endif()
 endif()