From 98bb341955e585f177bb67117fb2f825aef39591 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 28 Nov 2013 15:30:37 +0000 Subject: [PATCH] [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 --- lib/Target/Hexagon/TargetInfo/CMakeLists.txt | 3 --- lib/Target/R600/InstPrinter/CMakeLists.txt | 2 -- lib/Target/R600/TargetInfo/CMakeLists.txt | 2 -- lib/Target/SystemZ/AsmParser/CMakeLists.txt | 2 -- lib/Target/SystemZ/Disassembler/CMakeLists.txt | 2 -- lib/Target/SystemZ/InstPrinter/CMakeLists.txt | 2 -- lib/Target/SystemZ/TargetInfo/CMakeLists.txt | 2 -- lib/Target/X86/AsmParser/CMakeLists.txt | 2 -- lib/Target/X86/Disassembler/CMakeLists.txt | 2 -- lib/Target/X86/InstPrinter/CMakeLists.txt | 2 -- lib/Target/X86/MCTargetDesc/CMakeLists.txt | 3 --- lib/Target/X86/TargetInfo/CMakeLists.txt | 2 -- lib/Target/X86/Utils/CMakeLists.txt | 2 -- lib/Target/XCore/InstPrinter/CMakeLists.txt | 2 -- lib/Target/XCore/MCTargetDesc/CMakeLists.txt | 3 --- lib/Target/XCore/TargetInfo/CMakeLists.txt | 2 -- 16 files changed, 35 deletions(-) diff --git a/lib/Target/Hexagon/TargetInfo/CMakeLists.txt b/lib/Target/Hexagon/TargetInfo/CMakeLists.txt index 5b04a30d26c..092346b4bfa 100644 --- 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 069c55ba948..edc6524d25f 100644 --- 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 3d1584eba34..cd96d7ddd46 100644 --- 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 78a57146e1c..4f3d699a3b5 100644 --- 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 5bc1859816f..3f37a80a5e6 100644 --- 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 ddbf82fe16f..9e41f580849 100644 --- 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 b6051d3bf60..a390f017c45 100644 --- 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 54204d4b639..fcc105a0ebd 100644 --- 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 0cd6db96dab..3118b61b120 100644 --- 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 28e2460d823..a9adb17fecf 100644 --- 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 2eb5f25ffd4..83bd817de83 100644 --- 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 b1d0b9f9f9b..d9286fa2d97 100644 --- 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 2e72c344d99..0b0b45583e9 100644 --- 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 930e733cd7f..36a46cd7f4d 100644 --- 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 3a3f5b4cc63..8af5369d8f2 100644 --- 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 2c34b8730c8..51c0e25a238 100644 --- 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 ) -- 2.34.1