misc: refactor cmake scripts to support gcov (#165)

CMakeLists.txt

@@ -1,22 +1,39 @@
 cmake_minimum_required(VERSION 2.8.8)
 
+project(dsn C CXX)
+
 include(bin/dsn.cmake)
 
-project(dsn C CXX)
 set(DSN_BUILD_RUNTIME TRUE)
 add_definitions(-DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=0)
-if(DEFINED WARNING_ALL)
-    #add_compile_options("-Wall")
-    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
-    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall")
-endif()
-OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
-if(ENABLE_GCOV AND UNIX)
-    #add_compile_options("-fprofile-arcs" "-ftest-coverage")
-    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -DENABLE_GCOV")
-    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -DENABLE_GCOV")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
-endif()
 dsn_common_setup()
 
+# add custom target for gcov
+if(ENABLE_GCOV)
+    find_program(GCOV_PATH gcov)
+    find_program(GCOVR_PATH gcovr)
+
+    if(NOT GCOV_PATH)
+        message(FATAL_ERROR "gcov not found! Aborting...")
+    endif() # NOT GCOV_PATH
+
+    if(NOT GCOVR_PATH)
+        message(FATAL_ERROR "gcovr not found! Aborting...")
+    endif() # NOT GCOVR_PATH
+
+    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+        message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
+    endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
+
+    set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage" CACHE INTERNAL "")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}")
+    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
+
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
+endif()
+
+# install rdsn/include to ${CMAKE_INCLUDE_PREFIX}/include
+install(DIRECTORY include/ DESTINATION include)
+
 add_subdirectory(src)

bin/compiler_info.cmake

@@ -18,6 +18,7 @@
 # Sets COMPILER_FAMILY to 'clang' or 'gcc'
 # Sets COMPILER_VERSION to the version
 
+include(CMakeDetermineCXXCompiler)
 message("Running rdsn/bin/compiler_info.cmake")
 execute_process(COMMAND env LANG=C "${CMAKE_CXX_COMPILER}" -v
                 ERROR_VARIABLE COMPILER_VERSION_FULL)