Merge pull request #60 from everbase/master

CMakeLists.txt

@@ -37,7 +37,7 @@ add_cxx_compiler_flag(-Wall)
 add_cxx_compiler_flag(-Wshadow)
 add_cxx_compiler_flag(-Werror)
 add_cxx_compiler_flag(-pedantic-errors)
-add_cxx_compiler_flag(-Wzero-as-null-pointer-constant)
+#add_cxx_compiler_flag(-Wzero-as-null-pointer-constant)
 
 # Release flags
 add_cxx_compiler_flag(-fno-strict-aliasing RELEASE)

test/CMakeLists.txt

@@ -3,6 +3,7 @@ find_package(Threads REQUIRED)
 # Demonstration executable
 add_executable(benchmark_test benchmark_test.cc)
 target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT})
+add_dependencies(benchmark_test googletest)
 add_test(benchmark benchmark_test 50)
 add_test(benchmark_filter_simple benchmark_test --benchmark_filter=Calculate 16)
 add_test(benchmark_filter_prefix benchmark_test --benchmark_filter=*Calculate 0)
@@ -13,4 +14,5 @@ add_test(benchmark_filter_regex_wildcard benchmark_test --benchmark_filter=.*Cal
 # Test harness for regex wrapper
 add_executable(re_test ${RE_FILES} "re_test.cc")
 target_link_libraries(re_test benchmark_re gtest gtest_main ${CMAKE_THREAD_LIBS_INIT})
+add_dependencies(re_test googletest)
 add_test(regex re_test)