library names in line with those used by CMake.
- Patch by Johannes Obermayr, with tweaks by me.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146706
91177308-0d34-0410-b5e6-
96231b3b80d8
CPP.Flags += -DGTEST_HAS_PTHREAD=0
endif
CPP.Flags += -DGTEST_HAS_PTHREAD=0
endif
-TESTLIBS = -lGoogleTest -lUnitTestMain
+TESTLIBS = -lgtest -lgtest_main
ifeq ($(ENABLE_SHARED), 1)
ifneq (,$(RPATH))
ifeq ($(ENABLE_SHARED), 1)
ifneq (,$(RPATH))
# Get the library name, or None for LibraryGroups.
if c.type_name == 'Library':
# 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
else:
library_name = None
if library_name is None:
library_name_as_cstr = '0'
else:
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
print >>f, ' { "%s", %s, { %s } },' % (
name, library_name_as_cstr,
', '.join('"%s"' % dep
include $(LEVEL)/Makefile.config
include $(LEVEL)/Makefile.config
-LIBRARYNAME = UnitTestMain
+LIBRARYNAME = gtest_main
BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1
BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1
include $(LEVEL)/Makefile.config
include $(LEVEL)/Makefile.config
-LIBRARYNAME = GoogleTest
BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1
BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1