[llvm-commits] [llvm] r146706 - in /llvm/trunk: unittests/Makefile.unittest utils/llvm-build/llvmbuild/main.py utils/unittest/UnitTestMain/Makefile utils/unittest/googletest/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec 15 17:35:08 2011
New Revision: 146706

URL: http://llvm.org/viewvc/llvm-project?rev=146706&view=rev
Log:
build/unittests: Fix llvm-config names for gtest libraries, and bring Makefile
library names in line with those used by CMake.
 - Patch by Johannes Obermayr, with tweaks by me.

Modified:
    llvm/trunk/unittests/Makefile.unittest
    llvm/trunk/utils/llvm-build/llvmbuild/main.py
    llvm/trunk/utils/unittest/UnitTestMain/Makefile
    llvm/trunk/utils/unittest/googletest/Makefile

Modified: llvm/trunk/unittests/Makefile.unittest
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile.unittest?rev=146706&r1=146705&r2=146706&view=diff
==============================================================================
--- llvm/trunk/unittests/Makefile.unittest (original)
+++ llvm/trunk/unittests/Makefile.unittest Thu Dec 15 17:35:08 2011
@@ -34,7 +34,7 @@
   CPP.Flags += -DGTEST_HAS_PTHREAD=0
 endif
 
-TESTLIBS = -lGoogleTest -lUnitTestMain
+TESTLIBS = -lgtest -lgtest_main
 
 ifeq ($(ENABLE_SHARED), 1)
   ifneq (,$(RPATH))

Modified: llvm/trunk/utils/llvm-build/llvmbuild/main.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-build/llvmbuild/main.py?rev=146706&r1=146705&r2=146706&view=diff
==============================================================================
--- llvm/trunk/utils/llvm-build/llvmbuild/main.py (original)
+++ llvm/trunk/utils/llvm-build/llvmbuild/main.py Thu Dec 15 17:35:08 2011
@@ -329,7 +329,7 @@
             
             # Get the library name, or None for LibraryGroups.
             if c.type_name == 'Library':
-                library_name = c.get_library_name()
+                library_name = c.get_prefixed_library_name()
             else:
                 library_name = None
 
@@ -391,9 +391,7 @@
             if library_name is None:
                 library_name_as_cstr = '0'
             else:
-                # If we had a project level component, we could derive the
-                # library prefix.
-                library_name_as_cstr = '"libLLVM%s.a"' % library_name
+                library_name_as_cstr = '"lib%s.a"' % library_name
             print >>f, '  { "%s", %s, { %s } },' % (
                 name, library_name_as_cstr,
                 ', '.join('"%s"' % dep

Modified: llvm/trunk/utils/unittest/UnitTestMain/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/Makefile?rev=146706&r1=146705&r2=146706&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/UnitTestMain/Makefile (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Thu Dec 15 17:35:08 2011
@@ -11,7 +11,7 @@
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = UnitTestMain
+LIBRARYNAME = gtest_main
 BUILD_ARCHIVE = 1
 REQUIRES_RTTI = 1
 

Modified: llvm/trunk/utils/unittest/googletest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/Makefile?rev=146706&r1=146705&r2=146706&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/googletest/Makefile (original)
+++ llvm/trunk/utils/unittest/googletest/Makefile Thu Dec 15 17:35:08 2011
@@ -11,7 +11,7 @@
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = GoogleTest
+LIBRARYNAME = gtest
 BUILD_ARCHIVE = 1
 REQUIRES_RTTI = 1