diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2010-03-09 19:24:49 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2010-03-09 19:24:49 +0000 |
| commit | 28d5f76f8572bb790ac2757a9cbb64071c8a2e2b (patch) | |
| tree | 57889287bcb598c46be2d9e0c1a54d28ef494f79 | |
| parent | 525f34133d84cafcb0b17e30a0b75cd65f746770 (diff) | |
| download | bcm5719-llvm-28d5f76f8572bb790ac2757a9cbb64071c8a2e2b.tar.gz bcm5719-llvm-28d5f76f8572bb790ac2757a9cbb64071c8a2e2b.zip | |
Consolidate GoogleTest make options and duplicate them to its own makefile.
llvm-svn: 98074
| -rw-r--r-- | llvm/unittests/Makefile.unittest | 18 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/Makefile | 9 |
2 files changed, 19 insertions, 8 deletions
diff --git a/llvm/unittests/Makefile.unittest b/llvm/unittests/Makefile.unittest index b1c1d2c6b14..8fbcfd2fb15 100644 --- a/llvm/unittests/Makefile.unittest +++ b/llvm/unittests/Makefile.unittest @@ -14,18 +14,20 @@ # Set up variables for building a unit test. 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 LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT) -CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ -CPP.Flags += $(NO_VARIADIC_MACROS) +# Note that these flags are duplicated when building GoogleTest itself in +# 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 ifeq ($(ENABLE_SHARED), 1) diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index 15bbf4e69ea..688a5bda812 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -14,8 +14,17 @@ include $(LEVEL)/Makefile.config LIBRARYNAME = GoogleTest BUILD_ARCHIVE = 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 += $(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) CPP.Flags += -DGTEST_OS_WINDOWS=1 |
