[CMake] Prune include_directories() in llvm/lib/Target, take #2.

I forgot to commit them. They were staging in my local repo.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195924 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/Hexagon/TargetInfo/CMakeLists.txt b/lib/Target/Hexagon/TargetInfo/CMakeLists.txt
index 5b04a30d26c23e374803fe3229c877a0b05dcca5..092346b4bfaf256873b63c12ecaa63ba4852a64e 100644 (file)
--- a/lib/Target/Hexagon/TargetInfo/CMakeLists.txt
+++ b/lib/Target/Hexagon/TargetInfo/CMakeLists.txt
@@ -1,6 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. 
-                     ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMHexagonInfo
   HexagonTargetInfo.cpp
   )

diff --git a/lib/Target/R600/InstPrinter/CMakeLists.txt b/lib/Target/R600/InstPrinter/CMakeLists.txt
index 069c55ba948e37b968cfecd2f99a7dee31f5fc47..edc6524d25fab53f1c6ef74272d6a5e549591a0b 100644 (file)
--- a/lib/Target/R600/InstPrinter/CMakeLists.txt
+++ b/lib/Target/R600/InstPrinter/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMR600AsmPrinter
   AMDGPUInstPrinter.cpp
   )

diff --git a/lib/Target/R600/TargetInfo/CMakeLists.txt b/lib/Target/R600/TargetInfo/CMakeLists.txt
index 3d1584eba346ae433e205e3640fabec678ae2749..cd96d7ddd4662ab751205e7b1ad7d21162c5ae4f 100644 (file)
--- a/lib/Target/R600/TargetInfo/CMakeLists.txt
+++ b/lib/Target/R600/TargetInfo/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMR600Info
   AMDGPUTargetInfo.cpp
   )

diff --git a/lib/Target/SystemZ/AsmParser/CMakeLists.txt b/lib/Target/SystemZ/AsmParser/CMakeLists.txt
index 78a57146e1cb0374dae0abd3d1f75e2714d046f9..4f3d699a3b55a3e0219095b00f45359f619b1a2b 100644 (file)
--- a/lib/Target/SystemZ/AsmParser/CMakeLists.txt
+++ b/lib/Target/SystemZ/AsmParser/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMSystemZAsmParser
   SystemZAsmParser.cpp
   )

diff --git a/lib/Target/SystemZ/Disassembler/CMakeLists.txt b/lib/Target/SystemZ/Disassembler/CMakeLists.txt
index 5bc1859816fa866e1bc976a75b39d1f1619adf8e..3f37a80a5e64962393d38c38b3bf444764af929a 100644 (file)
--- a/lib/Target/SystemZ/Disassembler/CMakeLists.txt
+++ b/lib/Target/SystemZ/Disassembler/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMSystemZDisassembler
   SystemZDisassembler.cpp
   )

diff --git a/lib/Target/SystemZ/InstPrinter/CMakeLists.txt b/lib/Target/SystemZ/InstPrinter/CMakeLists.txt
index ddbf82fe16f6fca742985166f3cc9ad299ce6ecb..9e41f580849a49ec1cefd729c2cc4406c1c09c86 100644 (file)
--- a/lib/Target/SystemZ/InstPrinter/CMakeLists.txt
+++ b/lib/Target/SystemZ/InstPrinter/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMSystemZAsmPrinter
   SystemZInstPrinter.cpp
   )

diff --git a/lib/Target/SystemZ/TargetInfo/CMakeLists.txt b/lib/Target/SystemZ/TargetInfo/CMakeLists.txt
index b6051d3bf6004a211697afa7b7bd144b7fad813b..a390f017c45b037c0b880ac179c5fabe34371908 100644 (file)
--- a/lib/Target/SystemZ/TargetInfo/CMakeLists.txt
+++ b/lib/Target/SystemZ/TargetInfo/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMSystemZInfo
   SystemZTargetInfo.cpp
   )

diff --git a/lib/Target/X86/AsmParser/CMakeLists.txt b/lib/Target/X86/AsmParser/CMakeLists.txt
index 54204d4b6390801d5547f531e45a2b0d133dccad..fcc105a0ebda5d16a0fc00872f8f62dd29ffa36a 100644 (file)
--- a/lib/Target/X86/AsmParser/CMakeLists.txt
+++ b/lib/Target/X86/AsmParser/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMX86AsmParser
   X86AsmParser.cpp
   )

diff --git a/lib/Target/X86/Disassembler/CMakeLists.txt b/lib/Target/X86/Disassembler/CMakeLists.txt
index 0cd6db96dabe8562bd980e58d419d27f64e41d19..3118b61b12012608453bea4554e8e4276ae94754 100644 (file)
--- a/lib/Target/X86/Disassembler/CMakeLists.txt
+++ b/lib/Target/X86/Disassembler/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMX86Disassembler
   X86Disassembler.cpp
   X86DisassemblerDecoder.c

diff --git a/lib/Target/X86/InstPrinter/CMakeLists.txt b/lib/Target/X86/InstPrinter/CMakeLists.txt
index 28e2460d8233b3ca02af450e1c954cc2541f445f..a9adb17fecf2dbed743225f5b800c2501695223c 100644 (file)
--- a/lib/Target/X86/InstPrinter/CMakeLists.txt
+++ b/lib/Target/X86/InstPrinter/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMX86AsmPrinter
   X86ATTInstPrinter.cpp
   X86IntelInstPrinter.cpp

diff --git a/lib/Target/X86/MCTargetDesc/CMakeLists.txt b/lib/Target/X86/MCTargetDesc/CMakeLists.txt
index 2eb5f25ffd445ff6d279d16f4014f6837692d32c..83bd817de836bcdcddb887255cb3b104834b0708 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/X86/MCTargetDesc/CMakeLists.txt
@@ -11,6 +11,3 @@ add_llvm_library(LLVMX86Desc
   )
 
 add_dependencies(LLVMX86Desc X86CommonTableGen)
-
-# Hack: we need to include 'main' target directory to grab private headers
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)

diff --git a/lib/Target/X86/TargetInfo/CMakeLists.txt b/lib/Target/X86/TargetInfo/CMakeLists.txt
index b1d0b9f9f9bd121a2a245c827dec760775a5f858..d9286fa2d973b4fb72a1973cfc5a61edcd05219c 100644 (file)
--- a/lib/Target/X86/TargetInfo/CMakeLists.txt
+++ b/lib/Target/X86/TargetInfo/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMX86Info
   X86TargetInfo.cpp
   )

diff --git a/lib/Target/X86/Utils/CMakeLists.txt b/lib/Target/X86/Utils/CMakeLists.txt
index 2e72c344d99c17e7123b8d2dfcad99510e7eadf7..0b0b45583e96a857d55566acdb1bcbbede2f1609 100644 (file)
--- a/lib/Target/X86/Utils/CMakeLists.txt
+++ b/lib/Target/X86/Utils/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMX86Utils
   X86ShuffleDecode.cpp
   )

diff --git a/lib/Target/XCore/InstPrinter/CMakeLists.txt b/lib/Target/XCore/InstPrinter/CMakeLists.txt
index 930e733cd7f1c5ce0322dc0feea65b9f3ede23dd..36a46cd7f4d5540698605a0227a1f8ff00eccc4b 100644 (file)
--- a/lib/Target/XCore/InstPrinter/CMakeLists.txt
+++ b/lib/Target/XCore/InstPrinter/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMXCoreAsmPrinter
   XCoreInstPrinter.cpp
   )

diff --git a/lib/Target/XCore/MCTargetDesc/CMakeLists.txt b/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
index 3a3f5b4cc63ee234c19aed5e55dd5fb3b79f23f2..8af5369d8f207bd25cbb2253e27601672393c5e2 100644 (file)
--- a/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
@@ -4,6 +4,3 @@ add_llvm_library(LLVMXCoreDesc
   )
 
 add_dependencies(LLVMXCoreDesc XCoreCommonTableGen)
-
-# Hack: we need to include 'main' target directory to grab private headers
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)

diff --git a/lib/Target/XCore/TargetInfo/CMakeLists.txt b/lib/Target/XCore/TargetInfo/CMakeLists.txt
index 2c34b8730c85ada1018631fd82809fd9fc6faa0e..51c0e25a238a83df0e37acfa5477404ef168e567 100644 (file)
--- a/lib/Target/XCore/TargetInfo/CMakeLists.txt
+++ b/lib/Target/XCore/TargetInfo/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMXCoreInfo
   XCoreTargetInfo.cpp
   )