17 files changed, 42 insertions, 11 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index 9d275a00a24..dfe67cded33 100755
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -121,5 +121,5 @@ macro(add_llvm_target target_name)
   if ( TABLEGEN_OUTPUT )
     add_dependencies(LLVM${target_name} ${target_name}Table_gen)
   endif (TABLEGEN_OUTPUT)
-  set(CURRENT_LLVM_TARGET LLVM${target_name} PARENT_SCOPE)
+  set( CURRENT_LLVM_TARGET LLVM${target_name} )
 endmacro(add_llvm_target)
diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt
index 38741eb26f2..d3b8b54e76b 100644
--- a/llvm/lib/Target/ARM/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/CMakeLists.txt
@@ -62,3 +62,8 @@ set_property(
   PROPERTY COMPILE_FLAGS "/Od"
   )
 endif()
+
+add_subdirectory(TargetInfo)
+add_subdirectory(AsmParser)
+add_subdirectory(Disassembler)
+add_subdirectory(InstPrinter)
diff --git a/llvm/lib/Target/Alpha/CMakeLists.txt b/llvm/lib/Target/Alpha/CMakeLists.txt
index c8bd8666198..454262ad631 100644
--- a/llvm/lib/Target/Alpha/CMakeLists.txt
+++ b/llvm/lib/Target/Alpha/CMakeLists.txt
@@ -24,3 +24,5 @@ add_llvm_target(AlphaCodeGen
   AlphaTargetMachine.cpp
   AlphaSelectionDAGInfo.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/Blackfin/CMakeLists.txt b/llvm/lib/Target/Blackfin/CMakeLists.txt
index f19b666f49d..a47299ff161 100644
--- a/llvm/lib/Target/Blackfin/CMakeLists.txt
+++ b/llvm/lib/Target/Blackfin/CMakeLists.txt
@@ -24,3 +24,5 @@ add_llvm_target(BlackfinCodeGen
   BlackfinTargetMachine.cpp
   BlackfinSelectionDAGInfo.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/CBackend/CMakeLists.txt b/llvm/lib/Target/CBackend/CMakeLists.txt
index be243366d50..a23ff852970 100644
--- a/llvm/lib/Target/CBackend/CMakeLists.txt
+++ b/llvm/lib/Target/CBackend/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_llvm_target(CBackend
   CBackend.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/CMakeLists.txt b/llvm/lib/Target/CMakeLists.txt
index fe9a1264955..09b48ce632f 100644
--- a/llvm/lib/Target/CMakeLists.txt
+++ b/llvm/lib/Target/CMakeLists.txt
@@ -22,30 +22,20 @@ set(LLVM_ENUM_DISASSEMBLERS "")
 foreach(t ${LLVM_TARGETS_TO_BUILD})
   message(STATUS "Targeting ${t}")
   add_subdirectory(${t})
-  add_subdirectory(${t}/TargetInfo)
   set( td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t} )
   file(GLOB asmp_file "${td}/*AsmPrinter.cpp")
   if( asmp_file )
     set(LLVM_ENUM_ASM_PRINTERS
       "${LLVM_ENUM_ASM_PRINTERS}LLVM_ASM_PRINTER(${t})\n")
   endif()
-  if( EXISTS ${td}/InstPrinter/CMakeLists.txt )
-    add_subdirectory(${t}/InstPrinter)
-  endif()
   if( EXISTS ${td}/AsmParser/CMakeLists.txt )
-    add_subdirectory(${t}/AsmParser)
     set(LLVM_ENUM_ASM_PARSERS
       "${LLVM_ENUM_ASM_PARSERS}LLVM_ASM_PARSER(${t})\n")
   endif()
   if( EXISTS ${td}/Disassembler/CMakeLists.txt )
-    add_subdirectory(${t}/Disassembler)
     set(LLVM_ENUM_DISASSEMBLERS
       "${LLVM_ENUM_DISASSEMBLERS}LLVM_DISASSEMBLER(${t})\n")
   endif()
-  if( EXISTS ${td}/Utils/CMakeLists.txt )
-    add_subdirectory(${td}/Utils)
-  endif()
-  set(CURRENT_LLVM_TARGET)
 endforeach(t)
 
 # Produce llvm/Config/AsmPrinters.def
diff --git a/llvm/lib/Target/CellSPU/CMakeLists.txt b/llvm/lib/Target/CellSPU/CMakeLists.txt
index 633bdf65fde..a2a2ef1aa9a 100644
--- a/llvm/lib/Target/CellSPU/CMakeLists.txt
+++ b/llvm/lib/Target/CellSPU/CMakeLists.txt
@@ -25,3 +25,5 @@ add_llvm_target(CellSPUCodeGen
   SPUSelectionDAGInfo.cpp
   SPUNopFiller.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/CppBackend/CMakeLists.txt b/llvm/lib/Target/CppBackend/CMakeLists.txt
index f8182b80c94..e9375599511 100644
--- a/llvm/lib/Target/CppBackend/CMakeLists.txt
+++ b/llvm/lib/Target/CppBackend/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_llvm_target(CppBackend
   CPPBackend.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/MBlaze/CMakeLists.txt b/llvm/lib/Target/MBlaze/CMakeLists.txt
index e95fb5479e4..004057ad4ae 100644
--- a/llvm/lib/Target/MBlaze/CMakeLists.txt
+++ b/llvm/lib/Target/MBlaze/CMakeLists.txt
@@ -33,3 +33,8 @@ add_llvm_target(MBlazeCodeGen
   MBlazeELFWriterInfo.cpp
   MBlazeMCCodeEmitter.cpp
   )
+
+add_subdirectory(AsmParser)
+add_subdirectory(Disassembler)
+add_subdirectory(InstPrinter)
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/MSP430/CMakeLists.txt b/llvm/lib/Target/MSP430/CMakeLists.txt
index 38886007b5b..2c7cbb64418 100644
--- a/llvm/lib/Target/MSP430/CMakeLists.txt
+++ b/llvm/lib/Target/MSP430/CMakeLists.txt
@@ -24,3 +24,6 @@ add_llvm_target(MSP430CodeGen
   MSP430AsmPrinter.cpp
   MSP430MCInstLower.cpp
   )
+
+add_subdirectory(InstPrinter)
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/Mips/CMakeLists.txt b/llvm/lib/Target/Mips/CMakeLists.txt
index 53a5280a9dd..26df1a05295 100644
--- a/llvm/lib/Target/Mips/CMakeLists.txt
+++ b/llvm/lib/Target/Mips/CMakeLists.txt
@@ -24,3 +24,5 @@ add_llvm_target(MipsCodeGen
   MipsTargetObjectFile.cpp
   MipsSelectionDAGInfo.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/PTX/CMakeLists.txt b/llvm/lib/Target/PTX/CMakeLists.txt
index b7d964e9241..331266da30b 100644
--- a/llvm/lib/Target/PTX/CMakeLists.txt
+++ b/llvm/lib/Target/PTX/CMakeLists.txt
@@ -22,3 +22,5 @@ add_llvm_target(PTXCodeGen
   PTXSubtarget.cpp
   PTXTargetMachine.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/PowerPC/CMakeLists.txt b/llvm/lib/Target/PowerPC/CMakeLists.txt
index 104d7692f1b..f28257999d1 100644
--- a/llvm/lib/Target/PowerPC/CMakeLists.txt
+++ b/llvm/lib/Target/PowerPC/CMakeLists.txt
@@ -32,3 +32,6 @@ add_llvm_target(PowerPCCodeGen
   PPCTargetMachine.cpp
   PPCSelectionDAGInfo.cpp
   )
+
+add_subdirectory(InstPrinter)
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/Sparc/CMakeLists.txt b/llvm/lib/Target/Sparc/CMakeLists.txt
index 3739298da38..6839234a470 100644
--- a/llvm/lib/Target/Sparc/CMakeLists.txt
+++ b/llvm/lib/Target/Sparc/CMakeLists.txt
@@ -24,3 +24,5 @@ add_llvm_target(SparcCodeGen
   SparcTargetMachine.cpp
   SparcSelectionDAGInfo.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/SystemZ/CMakeLists.txt b/llvm/lib/Target/SystemZ/CMakeLists.txt
index cf02931cdf8..1f5d3552ae7 100644
--- a/llvm/lib/Target/SystemZ/CMakeLists.txt
+++ b/llvm/lib/Target/SystemZ/CMakeLists.txt
@@ -22,3 +22,5 @@ add_llvm_target(SystemZCodeGen
   SystemZTargetMachine.cpp
   SystemZSelectionDAGInfo.cpp
   )
+
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/X86/CMakeLists.txt b/llvm/lib/Target/X86/CMakeLists.txt
index b7100402955..b5fa94f12bc 100644
--- a/llvm/lib/Target/X86/CMakeLists.txt
+++ b/llvm/lib/Target/X86/CMakeLists.txt
@@ -57,3 +57,8 @@ endif()
 
 add_llvm_target(X86CodeGen ${sources})
 
+add_subdirectory(AsmParser)
+add_subdirectory(Disassembler)
+add_subdirectory(InstPrinter)
+add_subdirectory(TargetInfo)
+add_subdirectory(Utils)
diff --git a/llvm/lib/Target/XCore/CMakeLists.txt b/llvm/lib/Target/XCore/CMakeLists.txt
index 50459622889..9093de69158 100644
--- a/llvm/lib/Target/XCore/CMakeLists.txt
+++ b/llvm/lib/Target/XCore/CMakeLists.txt
@@ -23,3 +23,5 @@ add_llvm_target(XCoreCodeGen
   XCoreTargetObjectFile.cpp
   XCoreSelectionDAGInfo.cpp
   )
+
+add_subdirectory(TargetInfo)