Tidy up CMakeLists

Author: SSS-XPS-9530

.gitignore

@@ -12,3 +12,7 @@
 /CMakeCache.txt
 /src/benchmark/Makefile
 /src/benchmark/benchmark
+/src/test/CMakeFiles
+/Testing/Temporary
+/thirdparty/google/test/1.8.0/googletest/CMakeFiles
+*.lcov

CMakeLists.txt

@@ -1,5 +1,5 @@
-	 cmake_minimum_required (VERSION 2.8.11)
-project (benchmark)
+cmake_minimum_required (VERSION 2.8.11)
+project (any_ptr)
 
 foreach(p
     CMP0054 # CMake 3.1

src/benchmark/CMakeLists.txt

@@ -16,47 +16,3 @@ endmacro(compile_benchmark_test)
 # Demonstration executable
 compile_benchmark_test(benchmark)
 add_test(benchmark benchmark_any --benchmark_min_time=0.01)
-
-# Add the coverage command(s)
-if(CMAKE_BUILD_TYPE)
-  string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-endif()
-if (${CMAKE_BUILD_TYPE_LOWER} MATCHES "coverage")
-  find_program(GCOV gcov)
-  find_program(LCOV lcov)
-  find_program(GENHTML genhtml)
-  find_program(CTEST ctest)
-  if (GCOV AND LCOV AND GENHTML AND CTEST AND HAVE_CXX_FLAG_COVERAGE)
-    add_custom_command(
-      OUTPUT ${CMAKE_BINARY_DIR}/lcov/index.html
-      COMMAND ${LCOV} -q -z -d .
-      COMMAND ${LCOV} -q --no-external -c -b "${CMAKE_SOURCE_DIR}" -d . -o before.lcov -i
-      COMMAND ${CTEST} --force-new-ctest-process
-      COMMAND ${LCOV} -q --no-external -c -b "${CMAKE_SOURCE_DIR}" -d . -o after.lcov
-      COMMAND ${LCOV} -q -a before.lcov -a after.lcov --output-file final.lcov
-      COMMAND ${LCOV} -q -r final.lcov "'${CMAKE_SOURCE_DIR}/test/*'" -o final.lcov
-      COMMAND ${GENHTML} final.lcov -o lcov --demangle-cpp --sort -p "${CMAKE_BINARY_DIR}" -t benchmark
-      DEPENDS any_ptr_benchmark
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      COMMENT "Running LCOV"
-    )
-    add_custom_target(coverage
-      DEPENDS ${CMAKE_BINARY_DIR}/lcov/index.html
-      COMMENT "LCOV report at lcov/index.html"
-    )
-    message(STATUS "Coverage command added")
-  else()
-    if (HAVE_CXX_FLAG_COVERAGE)
-      set(CXX_FLAG_COVERAGE_MESSAGE supported)
-    else()
-      set(CXX_FLAG_COVERAGE_MESSAGE unavailable)
-    endif()
-    message(WARNING
-      "Coverage not available:\n"
-      "  gcov: ${GCOV}\n"
-      "  lcov: ${LCOV}\n"
-      "  genhtml: ${GENHTML}\n"
-      "  ctest: ${CTEST}\n"
-      "  --coverage flag: ${CXX_FLAG_COVERAGE_MESSAGE}")
-  endif()
-endif()

src/test/CMakeLists.txt

@@ -8,11 +8,11 @@ if (DEFINED BENCHMARK_CXX_LINKER_FLAGS)
   list(APPEND CMAKE_EXE_LINKER_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS})
 endif()
 
-add_executable(test_any_ptr "main.cpp" "test_any_shared_ptr.cpp")
-target_link_libraries(test_any_ptr gtest ${CMAKE_THREAD_LIBS_INIT})
+add_executable(any_ptr_test "main.cpp" "test_any_shared_ptr.cpp")
+target_link_libraries(any_ptr_test gtest ${CMAKE_THREAD_LIBS_INIT})
 
 # Demonstration executable
-add_test(test_any_ptr test_any_ptr --benchmark_min_time=0.01)
+add_test(any_ptr_test any_ptr_test)
 
 # Add the coverage command(s)
 if(CMAKE_BUILD_TYPE)
@@ -32,8 +32,8 @@ if (${CMAKE_BUILD_TYPE_LOWER} MATCHES "coverage")
       COMMAND ${LCOV} -q --no-external -c -b "${CMAKE_SOURCE_DIR}" -d . -o after.lcov
       COMMAND ${LCOV} -q -a before.lcov -a after.lcov --output-file final.lcov
       COMMAND ${LCOV} -q -r final.lcov "'${CMAKE_SOURCE_DIR}/test/*'" -o final.lcov
-      COMMAND ${GENHTML} final.lcov -o lcov --demangle-cpp --sort -p "${CMAKE_BINARY_DIR}" -t test_any_ptr
-      DEPENDS any_ptr_benchmark
+      COMMAND ${GENHTML} final.lcov -o lcov --demangle-cpp --sort -p "${CMAKE_BINARY_DIR}" -t any_ptr_test
+      DEPENDS any_ptr_test
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       COMMENT "Running LCOV"
     )