From: Dave Bartolomeo <dbartol@microsoft.com>
Date: Thu, 24 Dec 2015 18:51:35 +0000 (+0000)
Subject: Fix CodeView library name and non-CMake builds
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;ds=sidebyside;h=23d49e466a66bd8e5c02c07bdfb7f1e4347e14b0;hp=7c20e75d81525e2b0f7986de5742574b2ed3f23d;p=oota-llvm.git

Fix CodeView library name and non-CMake builds

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

diff --git a/lib/DebugInfo/CodeView/CMakeLists.txt b/lib/DebugInfo/CodeView/CMakeLists.txt
index 7853949bdb5..cfa0e4d8b40 100644
--- a/lib/DebugInfo/CodeView/CMakeLists.txt
+++ b/lib/DebugInfo/CodeView/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(LLVMCodeView
+add_llvm_library(LLVMDebugInfoCodeView
   FieldListRecordBuilder.cpp
   Line.cpp
   ListRecordBuilder.cpp
@@ -6,4 +6,7 @@ add_llvm_library(LLVMCodeView
   MethodListRecordBuilder.cpp
   TypeRecordBuilder.cpp
   TypeTableBuilder.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/CodeView
   )
diff --git a/lib/DebugInfo/CodeView/LLVMBuild.txt b/lib/DebugInfo/CodeView/LLVMBuild.txt
index 8df016c5c50..4db23376fce 100644
--- a/lib/DebugInfo/CodeView/LLVMBuild.txt
+++ b/lib/DebugInfo/CodeView/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/CodeView/LLVMBuild.txt -------------------------------*- Conf -*--===;
+;===- ./lib/DebugInfo/CodeView/LLVMBuild.txt -------------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,6 +17,6 @@
 
 [component_0]
 type = Library
-name = CodeView
-parent = Libraries
+name = DebugInfoCodeView
+parent = DebugInfo
 required_libraries = Support
diff --git a/lib/DebugInfo/CodeView/Makefile b/lib/DebugInfo/CodeView/Makefile
new file mode 100644
index 00000000000..535bc10b744
--- /dev/null
+++ b/lib/DebugInfo/CodeView/Makefile
@@ -0,0 +1,14 @@
+##===- lib/DebugInfo/CodeView/Makefile ---------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../..
+LIBRARYNAME = LLVMDebugInfoCodeView
+BUILD_ARCHIVE := 1
+
+include $(LEVEL)/Makefile.common