Use own build script for gtest

CHANGELOG.md

@@ -79,6 +79,7 @@
   * Updated gtest version to 1.8.1: [#478](https://github.com/personalrobotics/aikido/pull/478)
   * Added DART 6.7 support: [#480](https://github.com/personalrobotics/aikido/pull/480)
   * Fixed use of dart::common::make_unique for C++14 enabled compilers: [#481](https://github.com/personalrobotics/aikido/pull/481)
+  * Changed to use own build script for GoogleTest: [#485](https://github.com/personalrobotics/aikido/pull/485)
 
 ### 0.2.0 (2018-01-09)
 

CMakeLists.txt

@@ -101,21 +101,6 @@ macro(aikido_check_package variable component dependency)
   endif()
 endmacro()
 
-#==============================================================================
-# Register an Aikido test.
-#
-set_property(GLOBAL PROPERTY AIKIDO_TESTS)
-
-function(aikido_add_test target_name)
-  add_executable("${target_name}" ${ARGN})
-  add_test("${target_name}" "${target_name}")
-
-  target_link_libraries("${target_name}" gtest gtest_main)
-
-  set_property(GLOBAL APPEND PROPERTY AIKIDO_TESTS "${target_name}")
-  format_add_sources(${ARGN})
-endfunction()
-
 #==============================================================================
 # Required Dependencies
 #

tests/CMakeLists.txt

@@ -1,5 +1,26 @@
-# GTest setup.
-add_subdirectory(gtest)
+# GTest setup
+add_library(gtest STATIC "${CMAKE_CURRENT_SOURCE_DIR}/gtest/src/gtest-all.cc")
+target_include_directories(gtest SYSTEM BEFORE
+  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/gtest/include"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/gtest"
+)
+if(NOT WIN32)
+  target_link_libraries(gtest PUBLIC pthread)
+endif()
+add_library(gtest_main STATIC gtest/src/gtest_main.cc)
+target_link_libraries(gtest_main PUBLIC gtest)
+
+# Define aikido_add_test for registering Aikido tests.
+set_property(GLOBAL PROPERTY AIKIDO_TESTS)
+function(aikido_add_test target_name)
+  add_executable("${target_name}" ${ARGN})
+  add_test("${target_name}" "${target_name}")
+
+  target_link_libraries("${target_name}" gtest gtest_main)
+
+  set_property(GLOBAL APPEND PROPERTY AIKIDO_TESTS "${target_name}")
+  format_add_sources(${ARGN})
+endfunction()
 
 # Add helper scripts to the include path.
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")

tests/gtest/CMakeLists.txt

@@ -108,7 +108,7 @@ endif()
 set(gtest_build_include_dirs
   "${gtest_SOURCE_DIR}/include"
   "${gtest_SOURCE_DIR}")
-include_directories(SYSTEM ${gtest_build_include_dirs})
+include_directories(${gtest_build_include_dirs})
 
 # Summary of tuple support for Microsoft Visual Studio:
 # Compiler    version(MS)  version(cmake)  Support