From 3e9264dcf10e9fcc1d9ff25924fc2ca45a41b71f Mon Sep 17 00:00:00 2001 From: Niklas Hofmann Date: Thu, 16 Oct 2014 19:17:08 +0200 Subject: [PATCH 1/2] added googletest dependency to tests (allows compilation with -j) --- test/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 195d6797ec..3bff58f26a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,7 @@ # 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) @@ -11,4 +12,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) From 27aa01a3f9ddf21e34966a046767c3e8178ef2b3 Mon Sep 17 00:00:00 2001 From: Niklas Hofmann Date: Sun, 26 Oct 2014 03:23:15 +0100 Subject: [PATCH 2/2] remove -Wzero-as-null-pointer-constant flag for now --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e0f8d0582..480d8a599b 100644 --- a/CMakeLists.txt +++ b/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)