3 files changed, 26 insertions, 15 deletions
diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt
index 1eb60e7f3b5..95ac59e6dce 100644
--- a/tests/gtests/testing/CMakeLists.txt
+++ b/tests/gtests/testing/CMakeLists.txt
@@ -24,20 +24,11 @@
 set(INC
 	.
 	..
-	../../../extern/gflags/src
+	${GLOG_INCLUDE_DIRS}
+	${GFLAGS_INCLUDE_DIRS}
 	../../../extern/gtest/include
 )
 
-if(WIN32)
-	list(APPEND INC
-		../../../extern/glog/src/windows
-	)
-else()
-	list(APPEND INC
-		../../../extern/glog/src
-	)
-endif()
-
 set(INC_SYS
 )
 
@@ -47,7 +38,4 @@ set(SRC
 	testing.h
 )
 
-add_definitions(${GFLAGS_DEFINES})
-add_definitions(${GLOG_DEFINES})
-
 blender_add_lib(bf_testing_main "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/tests/gtests/testing/testing.h b/tests/gtests/testing/testing.h
index 1594ed3926c..d5a7b076970 100644
--- a/tests/gtests/testing/testing.h
+++ b/tests/gtests/testing/testing.h
@@ -12,6 +12,29 @@
     EXPECT_NEAR(a[2], b[2], eps); \
   } (void) 0
 
+#define EXPECT_V4_NEAR(a, b, eps) \
+{ \
+	EXPECT_NEAR(a[0], b[0], eps); \
+	EXPECT_NEAR(a[1], b[1], eps); \
+	EXPECT_NEAR(a[2], b[2], eps); \
+	EXPECT_NEAR(a[3], b[3], eps); \
+	} (void) 0
+
+#define EXPECT_M3_NEAR(a, b, eps) \
+do { \
+	EXPECT_V3_NEAR(a[0], b[0], eps); \
+	EXPECT_V3_NEAR(a[1], b[1], eps); \
+	EXPECT_V3_NEAR(a[2], b[2], eps); \
+} while(false);
+
+#define EXPECT_M4_NEAR(a, b, eps) \
+do { \
+	EXPECT_V3_NEAR(a[0], b[0], eps); \
+	EXPECT_V3_NEAR(a[1], b[1], eps); \
+	EXPECT_V3_NEAR(a[2], b[2], eps); \
+	EXPECT_V4_NEAR(a[3], b[3], eps); \
+} while(false);
+
 #define EXPECT_MATRIX_NEAR(a, b, tolerance) \
 do { \
   bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \
diff --git a/tests/gtests/testing/testing_main.cc b/tests/gtests/testing/testing_main.cc
index b2dcc445aca..e8104a2a026 100644
--- a/tests/gtests/testing/testing_main.cc
+++ b/tests/gtests/testing/testing_main.cc
@@ -28,7 +28,7 @@
 
 int main(int argc, char **argv) {
   testing::InitGoogleTest(&argc, argv);
-  gflags::ParseCommandLineFlags(&argc, &argv, true);
+  BLENDER_GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 
   return RUN_ALL_TESTS();