commit 2f61fc84c4edd3aa78810a80681b5dad3e41814e
author Tom Finegan <tomfinegan@google.com> Wed Sep 20 09:12:58 2017 -0700
committer Tom Finegan <tomfinegan@google.com> Wed Sep 20 21:37:29 2017 +0000
tree 8abc074c6733ca9b016ef9645fa6d4bfd35d66d3
parent f572cd30424745a998a4b3f9c2e39acc96cab56b

Add mingw-w64 CMake toolchain files.

BUG=aomedia:707

Change-Id: I9b819e630a1c56b5df359c6e65acb6f80ae513e3

test/test.cmake

diff --git a/test/test.cmake b/test/test.cmake
index 1a0fe8e..d981b92 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -353,16 +353,24 @@
     # Force static run time to avoid collisions with googletest.
     include("${AOM_ROOT}/build/cmake/msvc_runtime.cmake")
   endif ()
-  include_directories(
-    "${AOM_ROOT}/third_party/googletest/src/googletest/src"
-    "${AOM_ROOT}/third_party/googletest/src/googletest/include")
 
   if (BUILD_SHARED_LIBS AND APPLE)
     # Silence an RPATH warning.
     set(CMAKE_MACOSX_RPATH 1)
   endif ()
-  add_subdirectory("${AOM_ROOT}/third_party/googletest/src/googletest"
-                   EXCLUDE_FROM_ALL)
+
+  include_directories(
+    "${AOM_ROOT}/third_party/googletest/src/googletest/src"
+    "${AOM_ROOT}/third_party/googletest/src/googletest/include")
+
+  if (AOM_DISABLE_GTEST_CMAKE)
+    include_directories("${AOM_ROOT}/third_party/googletest/src/googletest")
+    add_library(gtest STATIC
+      "${AOM_ROOT}/third_party/googletest/src/googletest/src/gtest-all.cc")
+  else ()
+    add_subdirectory("${AOM_ROOT}/third_party/googletest/src/googletest"
+                     EXCLUDE_FROM_ALL)
+  endif ()
 
   # Generate a stub file containing the C function usage_exit(); this is
   # required because of the test dependency on aom_common_app_util.