zjx20 / googletest

Automatically exported from code.google.com/p/googletest
BSD 3-Clause "New" or "Revised" License
0 stars 0 forks source link

PATCH: Fix ‘make check’ in separate build directory #486

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago
The fused-gtest target only generates files in fused-src, not 
samples/sample1.cc or samples/sample1_unittest.cc.  Declaring the latter files 
as build products was preventing make from finding them in the source directory 
when using a separate build directory.

--- a/Makefile.am
+++ b/Makefile.am
@@ -273,7 +273,7 @@ test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src"
 # Build rules for putting fused Google Test files into the distribution
 # package. The user can also create those files by manually running
 # scripts/fuse_gtest_files.py.
-$(test_fused_gtest_test_SOURCES): fused-gtest
+$(FUSED_GTEST_SRC): fused-gtest

 fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
              $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \

Original issue reported on code.google.com by andersk@mit.edu on 5 Apr 2015 at 7:25