[llvm] r195921 - [CMake] Prune include_directories() in llvm/lib/Target. add_llvm_target() sets them.

NAKAMURA Takumi geek4civic at gmail.com
Thu Nov 28 06:53:30 PST 2013


Author: chapuni
Date: Thu Nov 28 08:53:30 2013
New Revision: 195921

URL: http://llvm.org/viewvc/llvm-project?rev=195921&view=rev
Log:
[CMake] Prune include_directories() in llvm/lib/Target. add_llvm_target() sets them.

Modified:
    llvm/trunk/lib/Target/AArch64/AsmParser/CMakeLists.txt
    llvm/trunk/lib/Target/AArch64/Disassembler/CMakeLists.txt
    llvm/trunk/lib/Target/AArch64/InstPrinter/CMakeLists.txt
    llvm/trunk/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
    llvm/trunk/lib/Target/AArch64/TargetInfo/CMakeLists.txt
    llvm/trunk/lib/Target/AArch64/Utils/CMakeLists.txt
    llvm/trunk/lib/Target/ARM/AsmParser/CMakeLists.txt
    llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt
    llvm/trunk/lib/Target/ARM/InstPrinter/CMakeLists.txt
    llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
    llvm/trunk/lib/Target/ARM/TargetInfo/CMakeLists.txt
    llvm/trunk/lib/Target/CppBackend/TargetInfo/CMakeLists.txt
    llvm/trunk/lib/Target/MSP430/InstPrinter/CMakeLists.txt
    llvm/trunk/lib/Target/MSP430/TargetInfo/CMakeLists.txt
    llvm/trunk/lib/Target/Mips/AsmParser/CMakeLists.txt
    llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt
    llvm/trunk/lib/Target/Mips/InstPrinter/CMakeLists.txt
    llvm/trunk/lib/Target/Mips/TargetInfo/CMakeLists.txt
    llvm/trunk/lib/Target/NVPTX/InstPrinter/CMakeLists.txt
    llvm/trunk/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt
    llvm/trunk/lib/Target/NVPTX/TargetInfo/CMakeLists.txt
    llvm/trunk/lib/Target/PowerPC/AsmParser/CMakeLists.txt
    llvm/trunk/lib/Target/PowerPC/InstPrinter/CMakeLists.txt
    llvm/trunk/lib/Target/PowerPC/TargetInfo/CMakeLists.txt
    llvm/trunk/lib/Target/Sparc/TargetInfo/CMakeLists.txt

Modified: llvm/trunk/lib/Target/AArch64/AsmParser/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AsmParser/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AsmParser/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AArch64/AsmParser/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMAArch64AsmParser
   AArch64AsmParser.cpp
   )

Modified: llvm/trunk/lib/Target/AArch64/Disassembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/Disassembler/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/Disassembler/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AArch64/Disassembler/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMAArch64Disassembler
   AArch64Disassembler.cpp
   )

Modified: llvm/trunk/lib/Target/AArch64/InstPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/InstPrinter/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/InstPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AArch64/InstPrinter/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMAArch64AsmPrinter
   AArch64InstPrinter.cpp
   )

Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -8,6 +8,3 @@ add_llvm_library(LLVMAArch64Desc
   AArch64MCTargetDesc.cpp
   )
 add_dependencies(LLVMAArch64Desc AArch64CommonTableGen)
-
-# Hack: we need to include 'main' target directory to grab private headers
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)

Modified: llvm/trunk/lib/Target/AArch64/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AArch64/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMAArch64Info
   AArch64TargetInfo.cpp
   )

Modified: llvm/trunk/lib/Target/AArch64/Utils/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/Utils/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/Utils/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AArch64/Utils/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMAArch64Utils
   AArch64BaseInfo.cpp
   )

Modified: llvm/trunk/lib/Target/ARM/AsmParser/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMARMAsmParser
   ARMAsmParser.cpp
   )

Modified: llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMARMDisassembler
   ARMDisassembler.cpp
   )

Modified: llvm/trunk/lib/Target/ARM/InstPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/InstPrinter/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/InstPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/InstPrinter/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMARMAsmPrinter
   ARMInstPrinter.cpp
   )

Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -12,6 +12,3 @@ add_llvm_library(LLVMARMDesc
   ARMMachORelocationInfo.cpp
   )
 add_dependencies(LLVMARMDesc ARMCommonTableGen)
-
-# Hack: we need to include 'main' target directory to grab private headers
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)

Modified: llvm/trunk/lib/Target/ARM/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMARMInfo
   ARMTargetInfo.cpp
   )

Modified: llvm/trunk/lib/Target/CppBackend/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CppBackend/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/CppBackend/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/CppBackend/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMCppBackendInfo
   CppBackendTargetInfo.cpp
   )

Modified: llvm/trunk/lib/Target/MSP430/InstPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSP430/InstPrinter/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/MSP430/InstPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/MSP430/InstPrinter/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMMSP430AsmPrinter
   MSP430InstPrinter.cpp
   )

Modified: llvm/trunk/lib/Target/MSP430/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSP430/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/MSP430/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/MSP430/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMMSP430Info
   MSP430TargetInfo.cpp
   )

Modified: llvm/trunk/lib/Target/Mips/AsmParser/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/AsmParser/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/AsmParser/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Mips/AsmParser/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,4 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 add_llvm_library(LLVMMipsAsmParser
   MipsAsmParser.cpp
   )

Modified: llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMMipsDisassembler
   MipsDisassembler.cpp
   )

Modified: llvm/trunk/lib/Target/Mips/InstPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/InstPrinter/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/InstPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Mips/InstPrinter/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMMipsAsmPrinter
   MipsInstPrinter.cpp
   )

Modified: llvm/trunk/lib/Target/Mips/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Mips/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMMipsInfo
   MipsTargetInfo.cpp
   )

Modified: llvm/trunk/lib/Target/NVPTX/InstPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/InstPrinter/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/InstPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/NVPTX/InstPrinter/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMNVPTXAsmPrinter
   NVPTXInstPrinter.cpp
   )

Modified: llvm/trunk/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -4,6 +4,3 @@ add_llvm_library(LLVMNVPTXDesc
   )
 
 add_dependencies(LLVMNVPTXDesc NVPTXCommonTableGen)
-
-# Hack: we need to include 'main' target directory to grab private headers
-#include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)

Modified: llvm/trunk/lib/Target/NVPTX/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/NVPTX/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-#include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMNVPTXInfo
   NVPTXTargetInfo.cpp
   )

Modified: llvm/trunk/lib/Target/PowerPC/AsmParser/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmParser/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/AsmParser/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/PowerPC/AsmParser/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,6 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/..
-                     ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMPowerPCAsmParser
   PPCAsmParser.cpp
   )

Modified: llvm/trunk/lib/Target/PowerPC/InstPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/InstPrinter/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/InstPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/PowerPC/InstPrinter/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMPowerPCAsmPrinter
   PPCInstPrinter.cpp
   )

Modified: llvm/trunk/lib/Target/PowerPC/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/PowerPC/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMPowerPCInfo
   PowerPCTargetInfo.cpp
   )

Modified: llvm/trunk/lib/Target/Sparc/TargetInfo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/TargetInfo/CMakeLists.txt?rev=195921&r1=195920&r2=195921&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Sparc/TargetInfo/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Sparc/TargetInfo/CMakeLists.txt Thu Nov 28 08:53:30 2013
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
 add_llvm_library(LLVMSparcInfo
   SparcTargetInfo.cpp
   )





More information about the llvm-commits mailing list