Merge branch '147-sonar-config' into 142-setup-travis-ci

Author: HerbertKoelman

.gitignore

@@ -72,6 +72,7 @@ compile_commands.json
 CTestTestfile.cmake
 
 # layout
+.scannerwork
 doxyfile
 *.tar
 sonar-project.properties

.travis.yml

@@ -37,7 +37,7 @@ matrix:
       env:
         BUILD_DIRECTORY=cmake-sonar-build
         CMAKE_COMMAND_LINE_ARGS="-DSONAR=yes"
-        MAKE_TARGETS="code-quality"
+        MAKE_TARGETS="all test code-quality"
     - name: default
       env:
         BUILD_DIRECTORY=cmake-default-build

CMakeLists.txt

@@ -23,6 +23,12 @@ endif()
 
 find_package(GTestExt   PATHS cmake)
 
+# This part MUST be executed before the loading of the CMake package
+set(SONAR_PROPERTIES_FILE ${CMAKE_CURRENT_BINARY_DIR}/sonar-project.properties)
+message(STATUS "Generating SONAR properties file ${SONAR_PROPERTIES_FILE}")
+configure_file(${CMAKE_CURRENT_LIST_DIR}/sonar-project.properties.in ${SONAR_PROPERTIES_FILE})
+find_package(SonarCloud PATHS cmake)
+
 # main targets --------------------------------------------------
 #
 if( CMAKE_BUILD_TYPE MATCHES Release )

cmake/SonarCloudConfig.cmake

@@ -43,6 +43,17 @@ if ( SONAR )
       add_dependencies(code-quality build-wrapper)
     endif()
 
+    find_program(SONAR_GCOV gcov)
+    if(SONAR_GCOV)
+      add_custom_target( sonar-gcov-report
+        COMMAND find ./CMakeFiles/ -type f -name "*.gcno" -exec ${SONAR_GCOV} {} -m \; > /dev/null 2>&1
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "Built sonar GCOV report (${SONAR_GCOV})"
+        VERBATIM
+        )
+      message(STATUS "Added custom target [sonar-gcov-report]...")
+      add_dependencies(code-quality sonar-gcov-report)
+    endif()
 
   else()
     message(SEND_ERROR "Failed to find the program [sonar_scanner], make sure sonar tools are installed.")

sonar-project.properties.in

@@ -1,37 +1,41 @@
+# Sonar cloud configuration fo @PROJECT_NAME@ - @PROJECT_VERSION@
 #
-# Project Configuration
-# Customize & run /path/to/sonar-runner/bin/sonar-runner -Dproject.settings=/path/to/sonar-project.properties
-#
+# Description: @PROJECT_DESCRIPTION@
+
 # Add more detail to both client and server-side analysis logs.
 sonar.verbose=false
 
-# Specify not the the source directory, but some parent of the source directory
-#sonar.projectBaseDir=/path/to/project/root
-#sonar.working.directory=/path/to/working/folder/.sonar
+#-----------------------------------------------------------------------------
+#
+# Sonar cloud (sonarcloud.io) related settings.
+#
+#-----------------------------------------------------------------------------
 
 # The project key that is unique for each project.
-sonar.projectKey=cpp-pthread
+sonar.projectKey=HerbertKoelman_cpp-pthread
+sonar.organization=herbertkoelman-github
+sonar.host.url=https://sonarcloud.io
 
-# Name of the project that will be displayed on the web interface.
-sonar.projectName=cpp-pthread
-sonar.projectVersion=@BUILD@
+# Sonar cloud access token.
+sonar.login=d9888da64996176bfb1c39145242d78052b37be0
 
-# Comma-separated paths to directories containing source files
-sonar.sources=src,include/pthread
-sonar.cfamily.build-wrapper-output.bypass=true
+# wrapper MUSt use this directory to produce it's data
+sonar.cfamily.build-wrapper-output=@CMAKE_CURRENT_BINARY_DIR@/bw-output
+sonar.cfamily.gcov.reportsPath=.
 
-# Set the language of the source code to analyze. If not set, a multi-language analysis will be triggered.
-#sonar.language=
-# to exclude source code files
-sonar.exclusions=**/TST/**/*,**/TST/*
+#-----------------------------------------------------------------------------
+#
+# Project related properties.
+#
+#-----------------------------------------------------------------------------
 
-# Comma-separated list of suffixes for files to analyze. To not filter, leave the list empty.
-#sonar.cobol.file.suffixes=cbl,kbl,sqb,kqb,cpy
-#sonar.cobol.copy.directories=
-#sonar.cobol.copy.suffixes=
+# Name of the project that will be displayed on the web interface.
+sonar.projectName=@PROJECT_NAME@
+sonar.projectVersion=@PROJECT_VERSION@
+sonar.links.homepage==https://github.com/HerbertKoelman/cpp-pthread
 
-#sonar.c.file.suffixes=.c,.h
-#sonar.cpp.file.suffixes=.cc,.cpp,.cxx,.c++,.hh,.hpp,.hxx,.h++,.ipp,.kpp,.sqC,.kqp
-#sonar.cfamily.predefinedMacros=#include "requiredMacros.h"
-#sonar.cfamily.library.directories=/path/to/requiredMacros.h,/path/to/include/files
+# Base directory
+sonar.projectBaseDir=@CMAKE_SOURCE_DIR@
 
+# directories that contain code to analyze
+sonar.sources=src,include