X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cmake%2Fmodules%2FTableGen.cmake;h=e3bdd9c7048302080153791b91e9314cf8a75d20;hb=6931055232eb2836dfc3e6dc51f06cee80dadf4b;hp=6fd48e2ad9e89d540c900e0c3132579915125b11;hpb=1bfc9f8ff2e585854a0c8fa6cc840cdefb9e5124;p=oota-llvm.git

diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake
index 6fd48e2ad9e..e3bdd9c7048 100644
--- a/cmake/modules/TableGen.cmake
+++ b/cmake/modules/TableGen.cmake
@@ -50,7 +50,10 @@ function(add_public_tablegen_target target)
   if( TABLEGEN_OUTPUT )
     add_custom_target(${target}
       DEPENDS ${TABLEGEN_OUTPUT})
-    add_dependencies(${target} ${LLVM_COMMON_DEPENDS})
+    if (LLVM_COMMON_DEPENDS)
+      add_dependencies(${target} ${LLVM_COMMON_DEPENDS})
+    endif ()
+    set_target_properties(${target} PROPERTIES FOLDER "Tablegenning")
   endif( TABLEGEN_OUTPUT )
 endfunction()
 
@@ -79,7 +82,7 @@ macro(add_tablegen target project)
   set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS})
   set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen)
   add_llvm_utility(${target} ${ARGN})
-  set(LLVM_LINK_COMPONENTS ${target}_OLD_LLVM_LINK_COMPONENTS)
+  set(LLVM_LINK_COMPONENTS ${${target}_OLD_LLVM_LINK_COMPONENTS})
 
   set(${project}_TABLEGEN "${target}" CACHE
       STRING "Native TableGen executable. Saves building one when cross-compiling.")