From 3aae44e19f4179819599dc154dfcee95e6879eb1 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Thu, 1 Jan 2009 01:29:44 +0000 Subject: [PATCH] Moved Google Test code up one directory so that we can use a standard LLVM Makefile with it, without resorting to the use of VPATH. Also added Makefiles at every level of the directory tree to properly recurse to Google Test and build it as a library (original Makefiles by Talin). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61539 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/Makefile | 2 +- utils/unittest/Makefile | 13 ++++++++++++ utils/unittest/googletest/Makefile | 20 +++++++++++++++++++ utils/unittest/googletest/README.LLVM | 4 ++-- .../googletest/{src => }/gtest-all.cc | 0 .../googletest/{src => }/gtest-death-test.cc | 0 .../googletest/{src => }/gtest-filepath.cc | 0 .../googletest/{src => }/gtest-internal-inl.h | 0 .../googletest/{src => }/gtest-port.cc | 0 .../googletest/{src => }/gtest-test-part.cc | 0 .../googletest/{src => }/gtest-typed-test.cc | 0 utils/unittest/googletest/{src => }/gtest.cc | 0 .../googletest/{src => }/gtest_main.cc | 0 13 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 utils/unittest/Makefile create mode 100644 utils/unittest/googletest/Makefile rename utils/unittest/googletest/{src => }/gtest-all.cc (100%) rename utils/unittest/googletest/{src => }/gtest-death-test.cc (100%) rename utils/unittest/googletest/{src => }/gtest-filepath.cc (100%) rename utils/unittest/googletest/{src => }/gtest-internal-inl.h (100%) rename utils/unittest/googletest/{src => }/gtest-port.cc (100%) rename utils/unittest/googletest/{src => }/gtest-test-part.cc (100%) rename utils/unittest/googletest/{src => }/gtest-typed-test.cc (100%) rename utils/unittest/googletest/{src => }/gtest.cc (100%) rename utils/unittest/googletest/{src => }/gtest_main.cc (100%) diff --git a/utils/Makefile b/utils/Makefile index 0cfaf1846d9..c43086ba21d 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = .. -PARALLEL_DIRS := TableGen fpcmp PerfectShuffle +PARALLEL_DIRS := TableGen fpcmp PerfectShuffle unittest EXTRA_DIST := cgiplotNLT.pl check-each-file codegen-diff countloc.sh cvsupdate \ DSAclean.py DSAextract.py emacs findsym.pl GenLibDeps.pl \ diff --git a/utils/unittest/Makefile b/utils/unittest/Makefile new file mode 100644 index 00000000000..2f3e601b41b --- /dev/null +++ b/utils/unittest/Makefile @@ -0,0 +1,13 @@ +##===- utils/unittest/Makefile -----------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## + +LEVEL = ../.. +PARALLEL_DIRS = googletest + +include $(LEVEL)/Makefile.common diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile new file mode 100644 index 00000000000..d73e85a5433 --- /dev/null +++ b/utils/unittest/googletest/Makefile @@ -0,0 +1,20 @@ +##===- utils/unittest/googletest/Makefile ------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## + +LEVEL := ../../.. +include $(LEVEL)/Makefile.config + +LIBRARYNAME = GoogleTest +BUILD_ARCHIVE = 1 +SOURCES = gtest-all.cc +CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/ +CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ +CPP.Flags += -Wno-missing-field-initializers -Wno-variadic-macros + +include $(LEVEL)/Makefile.common diff --git a/utils/unittest/googletest/README.LLVM b/utils/unittest/googletest/README.LLVM index 87b810838bd..38a77c01787 100644 --- a/utils/unittest/googletest/README.LLVM +++ b/utils/unittest/googletest/README.LLVM @@ -7,8 +7,8 @@ the actual source code, to minimize the addition to the LLVM distribution. Cleaned up as follows: $ rm -f aclocal* configure* Makefile* CHANGES CONTRIBUTORS README $ rm -rf build-aux m4 make msvc samples scons scripts test xcode - -# Clean up source files used for generating headers $ rm -f `find . -name \*\.pump` +$ mv src/* . +$ rmdir src For the license, see the file COPYING in this directory. diff --git a/utils/unittest/googletest/src/gtest-all.cc b/utils/unittest/googletest/gtest-all.cc similarity index 100% rename from utils/unittest/googletest/src/gtest-all.cc rename to utils/unittest/googletest/gtest-all.cc diff --git a/utils/unittest/googletest/src/gtest-death-test.cc b/utils/unittest/googletest/gtest-death-test.cc similarity index 100% rename from utils/unittest/googletest/src/gtest-death-test.cc rename to utils/unittest/googletest/gtest-death-test.cc diff --git a/utils/unittest/googletest/src/gtest-filepath.cc b/utils/unittest/googletest/gtest-filepath.cc similarity index 100% rename from utils/unittest/googletest/src/gtest-filepath.cc rename to utils/unittest/googletest/gtest-filepath.cc diff --git a/utils/unittest/googletest/src/gtest-internal-inl.h b/utils/unittest/googletest/gtest-internal-inl.h similarity index 100% rename from utils/unittest/googletest/src/gtest-internal-inl.h rename to utils/unittest/googletest/gtest-internal-inl.h diff --git a/utils/unittest/googletest/src/gtest-port.cc b/utils/unittest/googletest/gtest-port.cc similarity index 100% rename from utils/unittest/googletest/src/gtest-port.cc rename to utils/unittest/googletest/gtest-port.cc diff --git a/utils/unittest/googletest/src/gtest-test-part.cc b/utils/unittest/googletest/gtest-test-part.cc similarity index 100% rename from utils/unittest/googletest/src/gtest-test-part.cc rename to utils/unittest/googletest/gtest-test-part.cc diff --git a/utils/unittest/googletest/src/gtest-typed-test.cc b/utils/unittest/googletest/gtest-typed-test.cc similarity index 100% rename from utils/unittest/googletest/src/gtest-typed-test.cc rename to utils/unittest/googletest/gtest-typed-test.cc diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/gtest.cc similarity index 100% rename from utils/unittest/googletest/src/gtest.cc rename to utils/unittest/googletest/gtest.cc diff --git a/utils/unittest/googletest/src/gtest_main.cc b/utils/unittest/googletest/gtest_main.cc similarity index 100% rename from utils/unittest/googletest/src/gtest_main.cc rename to utils/unittest/googletest/gtest_main.cc -- 2.34.1