Fix tests

.gitmodules

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

.travis.yml

@@ -78,8 +78,8 @@ script:
   - mkdir build
   - cd build
   - cmake .. && make
-  - ./test/boolinqtest
-  - ./benchmark/boolinqbenchmark
+  - ./test/boolinq-test
+  - ./benchmark/boolinq-bench
   
 after_success:
   - coveralls --root .. --include include --gcov-options '\-lp' --gcov $GCOV --verbose

CMakeLists.txt

 # Common variables.
-CMAKE_MINIMUM_REQUIRED  (VERSION 3.0)
+CMAKE_MINIMUM_REQUIRED (VERSION 3.0)
 if (POLICY CMP0048)
     cmake_policy(SET CMP0048 NEW)
 endif()
-PROJECT                 (boolinq VERSION 3.0.0 LANGUAGES CXX)
+PROJECT (boolinq VERSION 3.0.0 LANGUAGES CXX)
 
 
 SET (CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS} -O0 -ggdb3 -DDEBUG")
@@ -27,11 +27,25 @@ 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/gtest)
-ADD_SUBDIRECTORY (externals/benchmark)
 ADD_SUBDIRECTORY (test)
-ADD_SUBDIRECTORY (benchmark)
-ADD_DEPENDENCIES (boolinqbenchmark gtest)
-ADD_DEPENDENCIES (boolinqbenchmark gtest_main)
-ADD_DEPENDENCIES (boolinqbenchmark benchmark)
+ADD_SUBDIRECTORY (bench)
+ADD_DEPENDENCIES ("${PROJECT_NAME}-test" googletest)
+ADD_DEPENDENCIES ("${PROJECT_NAME}-bench" benchmark)

bench/CMakeLists.txt

+# Common variables.
+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")
+SET (TARGET "${PROJECT_NAME}-bench" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdouble-promotion -Winit-self -Weffc++")
+SET (TARGET "${PROJECT_NAME}-bench" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wsign-promo")
+SET (TARGET "${PROJECT_NAME}-bench" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wvla -Winvalid-pch -Winline -Wredundant-decls")
+SET (TARGET "${PROJECT_NAME}-bench" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
+SET (TARGET "${PROJECT_NAME}-bench" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-qual -Wpointer-arith")
+SET (TARGET "${PROJECT_NAME}-bench" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
+
+
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/include/boolinq)
+INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/benchmark-src/include)
+INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/googletest-src/googletest/include)
+
+
+# Benchmarks.
+SET (
+    BoolinqBench_SOURCES
+    ${PROJECT_SOURCE_DIR}/bench/SpeedTest.cpp
+)
+ADD_EXECUTABLE (
+    "${PROJECT_NAME}-bench"
+    ${BoolinqBench_SOURCES}
+)
+TARGET_LINK_LIBRARIES (
+    "${PROJECT_NAME}-bench"
+    benchmark_main
+    gtest_main
+    gtest
+)

benchmark/SpeedTest.cpp → bench/SpeedTest.cpp

+#include <stdlib.h>
+#include <math.h>
+
 #include <benchmark/benchmark.h>
 #include <gtest/gtest.h>
 
-#include <stdlib.h>
-#include <math.h>
 #include "boolinq.h"
 
 

benchmark/CMakeLists.txt

-# Common variables.
-SET (CMAKE_BUILD_TYPE Release)
-SET (CMAKE_CXX_STANDARD 11)
-SET (CMAKE_CXX_STANDARD_REQUIRED ON)
-SET (TARGET boolinqbenchmark CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wmissing-include-dirs -Wfloat-equal -Wshadow")
-SET (TARGET boolinqbenchmark CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdouble-promotion -Winit-self -Weffc++")
-SET (TARGET boolinqbenchmark CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wsign-promo")
-SET (TARGET boolinqbenchmark CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wvla -Winvalid-pch -Winline -Wredundant-decls")
-SET (TARGET boolinqbenchmark CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
-SET (TARGET boolinqbenchmark CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-qual -Wpointer-arith")
-SET (TARGET boolinqbenchmark CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
-
-
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/externals/benchmark/include)
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/include/boolinq)
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/externals/gtest/include)
-
-
-# Benchmarks.
-SET (
-    BoolinqBenchmark_SOURCES
-    ${PROJECT_SOURCE_DIR}/benchmark/SpeedTest.cpp
-)
-ADD_EXECUTABLE (
-    boolinqbenchmark
-    ${BoolinqBenchmark_SOURCES}
-)
-TARGET_LINK_LIBRARIES (
-    boolinqbenchmark
-    gtest
-    benchmark
-)

benchmark @ 04a9343f

-Subproject commit 04a9343fc9b7886591c65933b94d0cee7a915452

gtest @ ec44c6c1

-Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780

test/CMakeLists.txt

 # Common variables.
 SET (CMAKE_CXX_STANDARD 11)
 SET (CMAKE_CXX_STANDARD_REQUIRED ON)
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wmissing-include-dirs -Wfloat-equal -Wshadow")
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdouble-promotion -Winit-self -Weffc++ ")
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wsign-promo")
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wvla -Winvalid-pch -Winline -Wredundant-decls")
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-qual -Wpointer-arith")
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
-SET (TARGET boolinqtest CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wmissing-include-dirs -Wfloat-equal -Wshadow")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdouble-promotion -Winit-self -Weffc++ ")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wsign-promo")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wvla -Winvalid-pch -Winline -Wredundant-decls")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-qual -Wpointer-arith")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
+SET (TARGET "${PROJECT_NAME}-test" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
 SET (CMAKE_SHARED_LINKER_FLAGS "-fprofile-arcs -ftest-coverage")
 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
 
 
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/include/boolinq)
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/externals/gtest/include)
-
+INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/googletest-src/googletest/include)
 
 # Unit tests.
 SET (
@@ -60,16 +59,17 @@ SET (
     ${PROJECT_SOURCE_DIR}/test/WhereTest.cpp
 )
 ADD_EXECUTABLE (
-    boolinqtest
+    "${PROJECT_NAME}-test"
     ${BoolinqTest_SOURCES}
 )
 TARGET_LINK_LIBRARIES (
-    boolinqtest
+    "${PROJECT_NAME}-test"
     gtest_main
+    gtest
     #gcov
 )
 ENABLE_TESTING ()
-ADD_TEST (BoolinqTest boolinqtest)
+ADD_TEST (BoolinqTest "${PROJECT_NAME}-test")
 
 
 # Test coverage report.
@@ -80,7 +80,7 @@ ADD_CUSTOM_COMMAND (
     COMMAND lcov -q -c -f -b . -d ${PROJECT_BINARY_DIR}/boolinq -o ${Coverage_REPORT}
     COMMAND lcov -e ${Coverage_REPORT} '${PROJECT_SOURCE_DIR}/boolinq/*' -o ${Coverage_REPORT}
     COMMAND genhtml ${Coverage_REPORT} --legend --demangle-cpp -f -q -o ${Coverage_DIR}
-    DEPENDS boolinqtest
+    DEPENDS "${PROJECT_NAME}-test"
 )
 ADD_CUSTOM_TARGET (coverage DEPENDS ${Coverage_REPORT})
 # FIXME: Doesn't work correctly (require explicit call cmake when files appear).