aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/XCore
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-07-15 00:40:52 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-07-15 00:40:52 +0000
commit4afa2b842b8ecc61c2023832c7cbbf6b6116837a (patch)
tree63d752ab1db750cad043dd162129e39aad261791 /lib/Target/XCore
parent96212ad674db09a03e803bcc5de98f2e5d367297 (diff)
downloadexternal_llvm-4afa2b842b8ecc61c2023832c7cbbf6b6116837a.zip
external_llvm-4afa2b842b8ecc61c2023832c7cbbf6b6116837a.tar.gz
external_llvm-4afa2b842b8ecc61c2023832c7cbbf6b6116837a.tar.bz2
Major update to CMake build to reflect changes in r135219 in the
backend. Moved some MCAsmInfo files down into the MCTargetDesc sublibraries, removed some (i suspect long) dead files from other parts of the CMake build, etc. Also copied the include directory hack from the Makefile. Finally, updated the lib deps. I spot checked this, and think its correct, but review appreciated there. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135234 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/XCore')
-rw-r--r--lib/Target/XCore/CMakeLists.txt1
-rw-r--r--lib/Target/XCore/MCTargetDesc/CMakeLists.txt8
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/Target/XCore/CMakeLists.txt b/lib/Target/XCore/CMakeLists.txt
index 98c3cfd..a1d73c6 100644
--- a/lib/Target/XCore/CMakeLists.txt
+++ b/lib/Target/XCore/CMakeLists.txt
@@ -13,7 +13,6 @@ add_llvm_target(XCoreCodeGen
XCoreInstrInfo.cpp
XCoreISelDAGToDAG.cpp
XCoreISelLowering.cpp
- XCoreMCAsmInfo.cpp
XCoreRegisterInfo.cpp
XCoreSubtarget.cpp
XCoreTargetMachine.cpp
diff --git a/lib/Target/XCore/MCTargetDesc/CMakeLists.txt b/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
index 849413f..c3b3dc9 100644
--- a/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
@@ -1 +1,7 @@
-add_llvm_library(LLVMXCoreDesc XCoreMCTargetDesc.cpp)
+add_llvm_library(LLVMXCoreDesc
+ XCoreMCTargetDesc.cpp
+ XCoreMCAsmInfo.cpp
+ )
+
+# Hack: we need to include 'main' target directory to grab private headers
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)