Permalink
Browse files

test: Upgrade to VW GTest

This provides us a slightly modified gtest 1.6
  • Loading branch information...
Zack Moratto
Zack Moratto committed Jan 30, 2012
1 parent c234602 commit 95efdafe1fc7c9fb95b2904000b917fc4581f786
View
@@ -10,10 +10,12 @@ GTEST_DIR = $(top_srcdir)/thirdparty/gtest
libgtest_la_SOURCES = $(GTEST_DIR)/src/gtest-all.cc $(top_srcdir)/src/test/test_main.cc
# this empty assignment prevents AM_LDFLAGS from applying to libgtest
libgtest_la_LDFLAGS =
+libgtest_la_LIBADD = @PKG_CORE_LIBS@ $(PKG_BOOST_FILESYSTEM_LIBS)
check_LTLIBRARIES = libgtest.la
-AM_CPPFLAGS += -DTEST_SRCDIR="\"$(top_srcdir)/$(subdir)\"" -I$(GTEST_DIR) -I$(GTEST_DIR)/include -g
+AM_CPPFLAGS += -DTEST_SRCDIR="\"$(abs_top_srcdir)/$(subdir)\"" -DTEST_OBJDIR="\"$(abs_top_builddir)/$(subdir)\"" -isystem $(GTEST_DIR) -isystem $(GTEST_DIR)/include -g @PKG_CORE_CPPFLAGS@
+
LDADD = libgtest.la
# This makes sure we're using the c++ linker
@@ -13,8 +13,9 @@ if MAKE_MODULE_CORE
TestErodeView_SOURCES = TestErodeView.cxx
TestBlobIndexThreaded_SOURCES = TestBlobIndexThreaded.cxx
+TestThreadedEdgeMask_SOURCES = TestThreadedEdgeMask.cxx
-TESTS = TestErodeView TestBlobIndexThreaded
+TESTS = TestErodeView TestBlobIndexThreaded TestThreadedEdgeMask
endif
@@ -4,8 +4,7 @@
// All Rights Reserved.
// __END_LICENSE__
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
#include <vw/FileIO.h>
#include <vw/Image.h>
@@ -4,8 +4,7 @@
// All Rights Reserved.
// __END_LICENSE__
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
#include <vw/Image/ImageViewRef.h>
#include <asp/Core/ErodeView.h>
@@ -4,8 +4,7 @@
// All Rights Reserved.
// __END_LICENSE__
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
#include <asp/IsisIO/PolyEquation.h>
#include <asp/IsisIO/RPNEquation.h>
@@ -4,12 +4,10 @@
// All Rights Reserved.
// __END_LICENSE__
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
#include <asp/IsisIO/IsisAdjustCameraModel.h>
#include <asp/IsisIO/IsisCameraModel.h>
-#include <test/Helpers.h>
#include <boost/foreach.hpp>
using namespace vw;
@@ -4,14 +4,12 @@
// All Rights Reserved.
// __END_LICENSE__
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
#include <vw/Math/Vector.h>
#include <vw/Core/Debugging.h>
#include <asp/IsisIO/IsisCameraModel.h>
#include <vw/Cartography/SimplePointImageManipulation.h>
-#include <test/Helpers.h>
#include <boost/foreach.hpp>
// Additional Headers required for ISIS
Oops, something went wrong.

0 comments on commit 95efdaf

Please sign in to comment.