6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-25 17:20:48 +00:00
Code Issues Projects Releases Wiki Activity

Consolidate GoogleTest make options and duplicate them to its own makefile.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98074 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth
2010-03-09 19:24:49 +00:00
parent 4e501545cd
commit f10e43ee7e
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
unittests/Makefile.unittest
View File

@@ -14,18 +14,20 @@
# Set up variables for building a unit test. # Set up variables for building a unit test.
ifdef TESTNAME ifdef TESTNAME
CPP.Flags += -DGTEST_HAS_RTTI=0
# gcc's TR1 <tuple> header depends on RTTI, so force googletest to use
# its own tuple implementation. When we import googletest >=1.4.0, we
# can drop this line.
CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT) LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT)
CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ # Note that these flags are duplicated when building GoogleTest itself in
CPP.Flags += $(NO_VARIADIC_MACROS) # utils/unittest/googletest/Makefile; ensure that any changes are made to both.
CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
CPP.Flags += -DGTEST_HAS_RTTI=0
# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not
# supported by Clang, so force googletest to use its own tuple implementation.
# When we import googletest >=1.4.0, we can drop this line.
CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
TESTLIBS = -lGoogleTest -lUnitTestMain TESTLIBS = -lGoogleTest -lUnitTestMain
ifeq ($(ENABLE_SHARED), 1) ifeq ($(ENABLE_SHARED), 1)

9
utils/unittest/googletest/Makefile
View File

@@ -14,8 +14,17 @@ include $(LEVEL)/Makefile.config
LIBRARYNAME = GoogleTest LIBRARYNAME = GoogleTest
BUILD_ARCHIVE = 1 BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1 REQUIRES_RTTI = 1
# Note that these flags are duplicated when building individual tests in
# unittests/Makefile.unittest; ensure that any changes are made to both.
CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
CPP.Flags += -DGTEST_HAS_RTTI=0
# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not
# supported by Clang, so force googletest to use its own tuple implementation.
# When we import googletest >=1.4.0, we can drop this line.
CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
ifeq ($(HOST_OS),MingW) ifeq ($(HOST_OS),MingW)
CPP.Flags += -DGTEST_OS_WINDOWS=1 CPP.Flags += -DGTEST_OS_WINDOWS=1