Fix CMake build

dschuff · Richard Diamond · commit 6dc9d8a19d6c · 2014-02-25T13:25:39.000-06:00
Clean up the LLVMBuild and CMakeLists.txt files BUG=none TEST=none Review URL: https://codereview.chromium.org/14328017 (cherry picked from commit 2f43696) Conflicts: lib/Target/Mips/CMakeLists.txt lib/Target/Mips/MCTargetDesc/CMakeLists.txt tools/llc/CMakeLists.txt tools/opt/CMakeLists.txt tools/opt/LLVMBuild.txt
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
@@ -56,3 +56,4 @@ add_llvm_library(LLVMAnalysis
 add_dependencies(LLVMAnalysis intrinsics_gen)
 
 add_subdirectory(IPA)
+add_subdirectory(NaCl) # LOCALMOD
diff --git a/lib/Analysis/NaCl/CMakeLists.txt b/lib/Analysis/NaCl/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_llvm_library(LLVMNaClAnalysis
-  PNaCLABITypeChecker.cpp
+add_llvm_library(LLVMnaclanalysis
+  PNaClABITypeChecker.cpp
   PNaClABIVerifyFunctions.cpp
   PNaClABIVerifyModule.cpp
   )
 
-add_dependencies(LLVMNaClAnalysis intrinsics_gen)
+add_dependencies(LLVMnaclanalysis intrinsics_gen)
diff --git a/lib/Analysis/NaCl/LLVMBuild.txt b/lib/Analysis/NaCl/LLVMBuild.txt
@@ -19,5 +19,5 @@
 type = Library
 name = NaClAnalysis
 parent = Analysis
-library_name = NaClAnalysis
+library_name = naclanalysis
 required_libraries = Analysis Core Support
diff --git a/lib/Target/Mips/MCTargetDesc/CMakeLists.txt b/lib/Target/Mips/MCTargetDesc/CMakeLists.txt
@@ -6,4 +6,7 @@ add_llvm_library(LLVMMipsDesc
   MipsMCTargetDesc.cpp
   MipsELFObjectWriter.cpp
   MipsTargetStreamer.cpp
+# LOCALMOD-BEGIN
+  MipsMCNaCl.cpp
+# LOCALMOD-END
   )
diff --git a/lib/Transforms/NaCl/CMakeLists.txt b/lib/Transforms/NaCl/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(LLVMTransformsNaCl
+add_llvm_library(LLVMnacltransforms
   ExpandConstantExpr.cpp
   ExpandCtors.cpp
   ExpandGetElementPtr.cpp
@@ -10,4 +10,4 @@ add_llvm_library(LLVMTransformsNaCl
   StripMetadata.cpp
   )
 
-add_dependencies(LLVMTransformsNaCl intrinsics_gen)
+add_dependencies(LLVMnacltransforms intrinsics_gen)
diff --git a/lib/Transforms/NaCl/LLVMBuild.txt b/lib/Transforms/NaCl/LLVMBuild.txt
@@ -19,5 +19,5 @@
 type = Library
 name = NaClTransforms
 parent = Transforms
-library_name = NaClTransforms
-required_libraries = Core
+library_name = nacltransforms
+required_libraries = Core Support
diff --git a/tools/opt/LLVMBuild.txt b/tools/opt/LLVMBuild.txt
@@ -19,4 +19,4 @@
 type = Tool
 name = opt
 parent = Tools
-required_libraries = AsmParser BitReader BitWriter IRReader IPO Instrumentation Scalar ObjCARC all-targets
+required_libraries = AsmParser BitReader BitWriter IRReader IPO Instrumentation Scalar ObjCARC NaClTransforms NaClAnalysis all-targets
diff --git a/tools/pnacl-abicheck/CMakeLists.txt b/tools/pnacl-abicheck/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS bitreader asmparser)
+set(LLVM_LINK_COMPONENTS bitreader asmparser naclanalysis)
 
 add_llvm_tool(pnacl-abicheck
-  pnacl-abicheck.cc
+  pnacl-abicheck.cpp
   )
diff --git a/tools/pnacl-abicheck/LLVMBuild.txt b/tools/pnacl-abicheck/LLVMBuild.txt
@@ -19,4 +19,4 @@
 type = Tool
 name = pnacl-abicheck
 parent = Tools
-required_libraries = AsmParser BitReader
+required_libraries = AsmParser BitReader NaClAnalysis

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,4 @@ add_llvm_library(LLVMAnalysis`
`56`	`56`	`add_dependencies(LLVMAnalysis intrinsics_gen)`
`57`	`57`
`58`	`58`	`add_subdirectory(IPA)`
	`59`	`+add_subdirectory(NaCl) # LOCALMOD`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,7 @@ add_llvm_library(LLVMMipsDesc`
`6`	`6`	`MipsMCTargetDesc.cpp`
`7`	`7`	`MipsELFObjectWriter.cpp`
`8`	`8`	`MipsTargetStreamer.cpp`
	`9`	`+# LOCALMOD-BEGIN`
	`10`	`+ MipsMCNaCl.cpp`
	`11`	`+# LOCALMOD-END`
`9`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-set(LLVM_LINK_COMPONENTS bitreader asmparser)`
	`1`	`+set(LLVM_LINK_COMPONENTS bitreader asmparser naclanalysis)`
`2`	`2`
`3`	`3`	`add_llvm_tool(pnacl-abicheck`
`4`		`- pnacl-abicheck.cc`
	`4`	`+ pnacl-abicheck.cpp`
`5`	`5`	`)`