Revert to submodules

.gitmodules

+[submodule "externals/googletest"]
+	path = externals/googletest
+	url = https://github.com/google/googletest.git
+[submodule "externals/benchmark"]
+	path = externals/benchmark
+	url = https://github.com/google/benchmark.git

.travis.yml

 language: none
-sudo: true
+sudo: false
 
 cache:
   apt: true

CMakeLists.txt

@@ -27,25 +27,10 @@ ADD_CUSTOM_TARGET  (cppcheck DEPENDS ${CppCheck_REPORT})
 SET_DIRECTORY_PROPERTIES (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CppCheck_REPORT})
 
 
-include(ExternalProject)
-ExternalProject_Add(benchmark
-        GIT_REPOSITORY    https://github.com/google/benchmark.git
-        GIT_TAG           v1.5.0
-        SOURCE_DIR        "${CMAKE_BINARY_DIR}/benchmark-src"
-        BINARY_DIR        "${CMAKE_BINARY_DIR}/benchmark-build"
-        CMAKE_ARGS        "-DBENCHMARK_ENABLE_GTEST_TESTS=OFF;-DCMAKE_BUILD_TYPE=Release"
-        )
-
-ExternalProject_Add(googletest
-        GIT_REPOSITORY    https://github.com/google/googletest.git
-        GIT_TAG           release-1.8.1
-        SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
-        BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
-        CMAKE_ARGS        "-DCMAKE_BUILD_TYPE=Release"
-        )
-
 # Testing.
+ADD_SUBDIRECTORY (externals/googletest)
+ADD_SUBDIRECTORY (externals/benchmark)
 ADD_SUBDIRECTORY (test)
 ADD_SUBDIRECTORY (bench)
-ADD_DEPENDENCIES ("${PROJECT_NAME}-test" googletest)
+ADD_DEPENDENCIES ("${PROJECT_NAME}-test" gtest)
 ADD_DEPENDENCIES ("${PROJECT_NAME}-bench" benchmark)

bench/CMakeLists.txt

 # Common variables.
-SET (CMAKE_BUILD_TYPE Release)
+#SET (CMAKE_BUILD_TYPE Release)
 SET (CMAKE_CXX_STANDARD 11)
 SET (CMAKE_CXX_STANDARD_REQUIRED ON)
 SET (TARGET "${PROJECT_NAME}-bench" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wmissing-include-dirs -Wfloat-equal -Wshadow")
@@ -27,7 +27,6 @@ ADD_EXECUTABLE (
 )
 TARGET_LINK_LIBRARIES (
     "${PROJECT_NAME}-bench"
-    benchmark_main
-    gtest_main
+    benchmark
     gtest
 )

benchmark @ 090faecb

+Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4

googletest @ 2fe3bd99

+Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2