Permalink
Browse files

thirdparty: Rename gtest.h to gtest_VW.h

This seems like the only way to get VW to find its own copy of gtest
over one that is installed by the system. Normally this wouldn't be a
problem but Macports and ROS want to install gtest 1.5 which causes
cryptic errors against VW who wants to use gtest 1.6.
  • Loading branch information...
Zack Moratto
Zack Moratto committed Jan 16, 2012
1 parent afb8b7b commit 1fe300c074d72e8c09b03b50d00b1ea25e9e5296
Showing with 105 additions and 105 deletions.
  1. +1 −1 Makefile.am
  2. +1 −1 src/vw/BundleAdjustment/tests/TestBundleAdjustment.cxx
  3. +1 −1 src/vw/BundleAdjustment/tests/TestCameraRelation.cxx
  4. +1 −1 src/vw/BundleAdjustment/tests/TestControlNetwork.cxx
  5. +1 −1 src/vw/BundleAdjustment/tests/TestControlNetworkLoad.cxx
  6. +1 −1 src/vw/Camera/tests/TestAdjustedCamera.cxx
  7. +1 −1 src/vw/Camera/tests/TestCAHVModel.cxx
  8. +1 −1 src/vw/Camera/tests/TestCAHVOREModel.cxx
  9. +1 −1 src/vw/Camera/tests/TestCAHVORModel.cxx
  10. +1 −1 src/vw/Camera/tests/TestCameraGeometry.cxx
  11. +1 −1 src/vw/Camera/tests/TestExifData.cxx
  12. +1 −1 src/vw/Camera/tests/TestLinearPushbroomModel.cxx
  13. +1 −1 src/vw/Camera/tests/TestPinholeModel.cxx
  14. +1 −1 src/vw/Camera/tests/TestPinholeModelCalibrate.cxx
  15. +1 −1 src/vw/Cartography/tests/TestCameraBBox.cxx
  16. +1 −1 src/vw/Cartography/tests/TestDatum.cxx
  17. +1 −1 src/vw/Cartography/tests/TestGeoReference.cxx
  18. +1 −1 src/vw/Cartography/tests/TestGeoTransform.cxx
  19. +1 −1 src/vw/Cartography/tests/TestOrthoImageView.cxx
  20. +1 −1 src/vw/Cartography/tests/TestPointImageManipulation.cxx
  21. +1 −1 src/vw/Cartography/tests/TestToastTransform.cxx
  22. +1 −1 src/vw/Core/tests/TestCache.cxx
  23. +1 −1 src/vw/Core/tests/TestCompoundTypes.cxx
  24. +1 −1 src/vw/Core/tests/TestExceptions.cxx
  25. +1 −1 src/vw/Core/tests/TestFunctors.cxx
  26. +1 −1 src/vw/Core/tests/TestFundamentalTypes.cxx
  27. +1 −1 src/vw/Core/tests/TestLog.cxx
  28. +1 −1 src/vw/Core/tests/TestSettings.cxx
  29. +1 −1 src/vw/Core/tests/TestThread.cxx
  30. +1 −1 src/vw/Core/tests/TestThreadPool.cxx
  31. +1 −1 src/vw/Core/tests/TestThreadQueue.cxx
  32. +1 −1 src/vw/Core/tests/TestTypeDeduction.cxx
  33. +1 −1 src/vw/FileIO/tests/TestBlockFileIO.cxx
  34. +1 −1 src/vw/FileIO/tests/TestDiskImageResource.cxx
  35. +1 −1 src/vw/FileIO/tests/TestDiskImageView.cxx
  36. +1 −1 src/vw/FileIO/tests/TestEndianness.cxx
  37. +1 −1 src/vw/FileIO/tests/TestGDALFeatures.cxx
  38. +1 −1 src/vw/FileIO/tests/TestMemoryImageResource.cxx
  39. +1 −1 src/vw/FileIO/tests/TestTemporaryFile.cxx
  40. +1 −1 src/vw/Geometry/tests/TestSpatialTree.cxx
  41. +1 −1 src/vw/Geometry/tests/TestSphere.cxx
  42. +1 −1 src/vw/Image/tests/TestAlgorithms.cxx
  43. +1 −1 src/vw/Image/tests/TestBlockRasterize.cxx
  44. +1 −1 src/vw/Image/tests/TestConvolution.cxx
  45. +1 −1 src/vw/Image/tests/TestEdgeExtension.cxx
  46. +1 −1 src/vw/Image/tests/TestFilter.cxx
  47. +1 −1 src/vw/Image/tests/TestImageMath.cxx
  48. +1 −1 src/vw/Image/tests/TestImageResource.cxx
  49. +1 −1 src/vw/Image/tests/TestImageView.cxx
  50. +1 −1 src/vw/Image/tests/TestImageViewMemory.cxx
  51. +1 −1 src/vw/Image/tests/TestImageViewRef.cxx
  52. +1 −1 src/vw/Image/tests/TestInterpolation.cxx
  53. +1 −1 src/vw/Image/tests/TestManipulation.cxx
  54. +1 −1 src/vw/Image/tests/TestMaskViews.cxx
  55. +1 −1 src/vw/Image/tests/TestMaskedImageMath.cxx
  56. +1 −1 src/vw/Image/tests/TestMaskedPixelMath.cxx
  57. +1 −1 src/vw/Image/tests/TestMaskedPixelMath2.cxx
  58. +1 −1 src/vw/Image/tests/TestPerPixelAccessorViews.cxx
  59. +1 −1 src/vw/Image/tests/TestPerPixelViews.cxx
  60. +1 −1 src/vw/Image/tests/TestPixelMath.cxx
  61. +1 −1 src/vw/Image/tests/TestPixelTypes.cxx
  62. +1 −1 src/vw/Image/tests/TestStatistics.cxx
  63. +1 −1 src/vw/Image/tests/TestTransform.cxx
  64. +1 −1 src/vw/Image/tests/TestUtilityViews.cxx
  65. +1 −1 src/vw/InterestPoint/tests/TestBoxFilter.cxx
  66. +1 −1 src/vw/InterestPoint/tests/TestIntegral.cxx
  67. +1 −1 src/vw/InterestPoint/tests/TestInterestData.cxx
  68. +1 −1 src/vw/InterestPoint/tests/TestMatcher.cxx
  69. +1 −1 src/vw/Math/tests/TestAccumulators.cxx
  70. +1 −1 src/vw/Math/tests/TestBBox.cxx
  71. +1 −1 src/vw/Math/tests/TestConjugateGradient.cxx
  72. +1 −1 src/vw/Math/tests/TestEuler.cxx
  73. +1 −1 src/vw/Math/tests/TestFunctions.cxx
  74. +1 −1 src/vw/Math/tests/TestFunctors.cxx
  75. +1 −1 src/vw/Math/tests/TestGeometry.cxx
  76. +1 −1 src/vw/Math/tests/TestKDTree.cxx
  77. +1 −1 src/vw/Math/tests/TestLevenbergMarquardt.cxx
  78. +1 −1 src/vw/Math/tests/TestLinearAlgebra.cxx
  79. +1 −1 src/vw/Math/tests/TestMatrix.cxx
  80. +1 −1 src/vw/Math/tests/TestMatrixSparseSkyline.cxx
  81. +1 −1 src/vw/Math/tests/TestNelderMead.cxx
  82. +1 −1 src/vw/Math/tests/TestParticleSwarmOptimization.cxx
  83. +1 −1 src/vw/Math/tests/TestPoseEstimation.cxx
  84. +1 −1 src/vw/Math/tests/TestQuaternion.cxx
  85. +1 −1 src/vw/Math/tests/TestVector.cxx
  86. +1 −1 src/vw/Mosaic/tests/TestImageComposite.cxx
  87. +1 −1 src/vw/Plate/tests/TestBlobIO.cxx
  88. +1 −1 src/vw/Plate/tests/TestBlobManager.cxx
  89. +1 −1 src/vw/Plate/tests/TestDatastore.cxx
  90. +1 −1 src/vw/Plate/tests/TestHTTPUtils.cxx
  91. +1 −1 src/vw/Plate/tests/TestIndexPage.cxx
  92. +1 −1 src/vw/Plate/tests/TestLocalIndex.cxx
  93. +1 −1 src/vw/Plate/tests/TestModPlate.cxx
  94. +1 −1 src/vw/Plate/tests/TestPlateManager.cxx
  95. +1 −1 src/vw/Plate/tests/TestRpc.cxx
  96. +1 −1 src/vw/Plate/tests/TestRpcChannel.cxx
  97. +1 −1 src/vw/Plate/tests/TestSnapshotManager.cxx
  98. +1 −1 src/vw/Plate/tests/TestTileManipulation.cxx
  99. +1 −1 src/vw/Plate/tests/TestTransactions.cxx
  100. +1 −1 src/vw/Stereo/tests/TestCorrelator.cxx
  101. +1 −1 src/vw/Stereo/tests/TestDisparity.cxx
  102. +1 −1 src/vw/Stereo/tests/TestStereoModel.cxx
  103. +1 −1 src/vw/Stereo/tests/TestSubPixel.cxx
  104. 0 thirdparty/gtest/include/gtest/{gtest.h → gtest_VW.h}
  105. +1 −1 thirdparty/gtest/src/gtest-all.cc
  106. +1 −1 thirdparty/gtest/src/gtest_main.cc
View
@@ -30,7 +30,7 @@ EXTRA_DIST = \
thirdparty/gtest/CHANGES \
thirdparty/gtest/CONTRIBUTORS \
thirdparty/gtest/COPYING \
- thirdparty/gtest/include/gtest/gtest.h \
+ thirdparty/gtest/include/gtest/gtest_VW.h \
thirdparty/gtest/README \
thirdparty/gtest/src/gtest-all.cc \
thirdparty/gtest/src/gtest_main.cc
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Math/Vector.h>
#include <vw/Math/EulerAngles.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <iostream>
#include <sstream>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <sstream>
#include <vw/BundleAdjustment/ControlNetwork.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <sstream>
#include <vw/BundleAdjustment/ControlNetworkLoader.h>
@@ -6,7 +6,7 @@
// TestPinholeModel.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Math/EulerAngles.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Camera/CAHVModel.h>
#include <vw/Camera/PinholeModel.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Camera/CAHVOREModel.h>
#include <vw/Math/Vector.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Camera/CAHVORModel.h>
#include <vw/Math/Vector.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <boost/random.hpp>
@@ -6,7 +6,7 @@
// TestExifData
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <cstdio>
#include <vw/Camera/Exif.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Math/Vector.h>
#include <vw/Camera/LinearPushbroomModel.h>
@@ -6,7 +6,7 @@
// TestPinholeModel.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <boost/random.hpp>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Camera/PinholeModelCalibrate.h>
#include <test/Helpers.h>
@@ -6,7 +6,7 @@
// TestCameraBBox.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Cartography/CameraBBox.h>
@@ -6,7 +6,7 @@
// TestDatum.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Cartography/Datum.h>
@@ -6,7 +6,7 @@
// TestGeoReference.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Cartography/GeoReference.h>
@@ -6,7 +6,7 @@
// TestGeoTransform.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Cartography/GeoReference.h>
@@ -6,7 +6,7 @@
// TestCameraBBox.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Image/ImageViewRef.h>
@@ -6,7 +6,7 @@
// TestGeoReference.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Cartography/PointImageManipulation.h>
@@ -6,7 +6,7 @@
// TestGeoReference.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Cartography/ToastTransform.h>
@@ -6,7 +6,7 @@
#include <memory>
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/Cache.h>
#include <vw/Core/FundamentalTypes.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/CompoundTypes.h>
#include <boost/numeric/conversion/cast.hpp>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/Exception.h>
#include <test/Helpers.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/Functors.h>
using namespace vw;
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/FundamentalTypes.h>
#include <sstream>
@@ -20,7 +20,7 @@
#include <boost/bind.hpp>
#include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
using namespace vw;
@@ -9,7 +9,7 @@
#include <fstream>
#include <sstream>
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/Settings.h>
#include <vw/Core/ConfigParser.h>
#include <test/Helpers.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/Thread.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/ThreadPool.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Core/ThreadQueue.h>
using namespace vw;
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Core/TypeDeduction.h>
@@ -6,7 +6,7 @@
// TestBlockFileIO.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/FileIO/DiskImageResource.h>
#include <vw/FileIO/DiskImageView.h>
#include <test/Helpers.h>
@@ -6,7 +6,7 @@
// TestDiskImageResource.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/FileIO.h>
#include <vw/FileIO/DiskImageResource_internal.h>
#include <vw/Image/PixelTypes.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/FileIO/DiskImageView.h>
#include <vw/config.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Image/PixelTypes.h>
#include <vw/Image/ImageView.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/FileIO.h>
#include <vw/Image/ImageView.h>
#include <vw/Image/ImageIO.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/FileIO/MemoryImageResource.h>
#include <vw/FileIO/DiskImageResource.h>
@@ -7,7 +7,7 @@
#include <vw/FileIO/TemporaryFile.h>
#include <vw/Core/Settings.h>
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/convenience.hpp>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Geometry/SpatialTree.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Geometry/Sphere.h>
#include <vw/Math/Vector.h>
@@ -6,7 +6,7 @@
// Image/tests/TestAlgorithms.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Image/Algorithms.h>
#include <vw/Image/ImageView.h>
@@ -5,7 +5,7 @@
// __END_LICENSE__
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <test/Helpers.h>
#include <vw/Image/BlockRasterize.h>
@@ -6,7 +6,7 @@
// TestConvolution.h
-#include <gtest/gtest.h>
+#include <gtest/gtest_VW.h>
#include <vw/Image/Convolution.h>
#include <vw/Image/ImageView.h>
Oops, something went wrong.

0 comments on commit 1fe300c

Please sign in to comment.