[llvm] r256387 - Fix CodeView library name and non-CMake builds

[Dave Bartolomeo via llvm-commits]

Author: dbartol
Date: Thu Dec 24 12:51:35 2015
New Revision: 256387

URL: http://llvm.org/viewvc/llvm-project?rev=256387&view=rev
Log:
Fix CodeView library name and non-CMake builds

Added:
    llvm/trunk/lib/DebugInfo/CodeView/Makefile
Modified:
    llvm/trunk/lib/DebugInfo/CodeView/CMakeLists.txt
    llvm/trunk/lib/DebugInfo/CodeView/LLVMBuild.txt

Modified: llvm/trunk/lib/DebugInfo/CodeView/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/CMakeLists.txt?rev=256387&r1=256386&r2=256387&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/CodeView/CMakeLists.txt (original)
+++ llvm/trunk/lib/DebugInfo/CodeView/CMakeLists.txt Thu Dec 24 12:51:35 2015
@@ -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
   )

Modified: llvm/trunk/lib/DebugInfo/CodeView/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/LLVMBuild.txt?rev=256387&r1=256386&r2=256387&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/CodeView/LLVMBuild.txt (original)
+++ llvm/trunk/lib/DebugInfo/CodeView/LLVMBuild.txt Thu Dec 24 12:51:35 2015
@@ -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

Added: llvm/trunk/lib/DebugInfo/CodeView/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/Makefile?rev=256387&view=auto
==============================================================================
--- llvm/trunk/lib/DebugInfo/CodeView/Makefile (added)
+++ llvm/trunk/lib/DebugInfo/CodeView/Makefile Thu Dec 24 12:51:35 2015
@@ -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