Merge lp:~chris.gagnon/cmake-extras/lowercase-lcov-cleanup-whitespace into lp:cmake-extras

[Chris Gagnon]

[Jussi Pakkanen (jpakkane)]

LGTM

review: Approve

[Allan LeSage (allanlesage)]

The casing matches not the binary but the supporting cmake file, in this case 'FindLcov.cmake', so this breaks. Surveying the output of 'ls /usr/share/cmake-2.8/Modules/' there doesn't appear to be a standard for casing, although camel-case appears more common. What should we do?

review: Needs Fixing

[lp:~chris.gagnon/cmake-extras/lowercase-lcov-cleanup-whitespace]

7. By Chris Gagnon on 2014-05-28

make gcover follow cmake standard, revert lowercase lcov

[Michi Henning (michihenning)]

Seeing that Findgcovr will rarely be called directly and normally be dragged in as part of EnableCoverageReport, I think it makes sense to change this.

review: Approve

Unmerged revisions

7. By Chris Gagnon on 2014-05-28

make gcover follow cmake standard, revert lowercase lcov

6. By Chris Gagnon on 2014-05-28

lowercase Lcov, clean up whitespace

=== modified file 'EnableCoverageReport.cmake'
--- EnableCoverageReport.cmake	2014-05-27 12:26:14 +0000
+++ EnableCoverageReport.cmake	2014-05-28 15:24:32 +0000
@@ -37,10 +37,10 @@
 #     Bielefeld University
 
 FIND_PACKAGE(Lcov)
-FIND_PACKAGE(gcovr)
+FIND_PACKAGE(Gcovr)
 
 FUNCTION(ENABLE_COVERAGE_REPORT)
-    
+
     # argument parsing
     SET(MULTI_VALUE_ARGS FILTER TARGETS TESTS)
     CMAKE_PARSE_ARGUMENTS(ENABLE_COVERAGE_REPORT "" "" "${MULTI_VALUE_ARGS}" ${ARGN})
@@ -50,7 +50,7 @@
     SET(COVERAGE_REPORT_DIR "${CMAKE_BINARY_DIR}/coveragereport")
     SET(COVERAGE_XML_FILE "${CMAKE_BINARY_DIR}/coverage.xml")
     SET(COVERAGE_XML_COMMAND_FILE "${CMAKE_BINARY_DIR}/coverage-xml.cmake")
-    
+
     # decide if there is any tool to create coverage data
     SET(TOOL_FOUND FALSE)
     IF(LCOV_FOUND OR GCOVR_FOUND)
@@ -59,34 +59,34 @@
     IF(NOT TOOL_FOUND)
         MESSAGE(STATUS "Cannot enable coverage targets because neither lcov nor gcovr are found.")
     ENDIF()
-    
+
     IF(CMAKE_COMPILER_IS_GNUCXX AND TOOL_FOUND AND "${enable_coverage}")
-    
+
         MESSAGE(STATUS "Coverage support enabled for targets: ${ENABLE_COVERAGE_REPORT_TARGETS}")
-    
+
         # create coverage build type
         SET(CMAKE_CXX_FLAGS_COVERAGE ${CMAKE_CXX_FLAGS_DEBUG} PARENT_SCOPE)
         SET(CMAKE_C_FLAGS_COVERAGE ${CMAKE_C_FLAGS_DEBUG} PARENT_SCOPE)
         SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} coverage PARENT_SCOPE)
-    
+
         # instrument targets
         SET_TARGET_PROPERTIES(${ENABLE_COVERAGE_REPORT_TARGETS} PROPERTIES COMPILE_FLAGS --coverage
                                                         LINK_FLAGS --coverage)
-    
+
         # html report
         IF (LCOV_FOUND)
-        
+
             MESSAGE(STATUS "Enabling HTML coverage report")
-    
+
             # set up coverage target
-            
+
             ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_RAW_FILE}
                                COMMAND ${LCOV_EXECUTABLE} -c -d ${CMAKE_BINARY_DIR} -o ${COVERAGE_RAW_FILE}
                                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                                COMMENT "Collecting coverage data"
                                DEPENDS ${ENABLE_COVERAGE_REPORT_TARGETS} ${ENABLE_COVERAGE_REPORT_TESTS}
                                VERBATIM)
-            
+
             # filter unwanted stuff
             LIST(LENGTH ENABLE_COVERAGE_REPORT_FILTER FILTER_LENGTH)
             IF(${FILTER_LENGTH} GREATER 0)
@@ -98,7 +98,7 @@
             ELSE()
                 SET(FILTER "")
             ENDIF()
-            
+
             ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_FILTERED_FILE}
                                COMMAND ${LCOV_EXECUTABLE} -e ${COVERAGE_RAW_FILE} "${CMAKE_SOURCE_DIR}*"  -o ${COVERAGE_FILTERED_FILE}
                                ${FILTER}
@@ -111,34 +111,34 @@
                                DEPENDS ${COVERAGE_FILTERED_FILE}
                                COMMENT "Generating HTML coverage report in ${COVERAGE_REPORT_DIR}"
                                VERBATIM)
-                               
+
             ADD_CUSTOM_TARGET(coverage-html
                               DEPENDS ${COVERAGE_REPORT_DIR})
-                              
+
         ENDIF()
-        
+
         # xml coverage report
         IF(GCOVR_FOUND)
-        
+
             MESSAGE(STATUS "Enabling XML coverage report")
-        
+
             # gcovr cannot write directly to a file so the execution needs to
             # be wrapped in a cmake file that generates the file output
             FILE(WRITE ${COVERAGE_XML_COMMAND_FILE}
                  "SET(ENV{LANG} en)\n")
             FILE(APPEND ${COVERAGE_XML_COMMAND_FILE}
                  "EXECUTE_PROCESS(COMMAND \"${GCOVR_EXECUTABLE}\" -x -r \"${CMAKE_SOURCE_DIR}\" OUTPUT_FILE \"${COVERAGE_XML_FILE}\" WORKING_DIRECTORY \"${CMAKE_BINARY_DIR}\")\n")
-        
+
             ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_XML_FILE}
                                COMMAND ${CMAKE_COMMAND} ARGS -P ${COVERAGE_XML_COMMAND_FILE}
                                COMMENT "Generating coverage XML report"
                                VERBATIM)
-                               
+
             ADD_CUSTOM_TARGET(coverage-xml
                               DEPENDS ${COVERAGE_XML_FILE})
-        
+
         ENDIF()
-        
+
         # provide a global coverage target executing both steps if available
         SET(GLOBAL_DEPENDS "")
         IF(LCOV_FOUND)
@@ -151,7 +151,7 @@
             ADD_CUSTOM_TARGET(coverage
                               DEPENDS ${GLOBAL_DEPENDS})
         ENDIF()
-                          
+
     ENDIF()
 
-ENDFUNCTION()   
+ENDFUNCTION()
 
=== added file 'FindGcovr.cmake'
--- FindGcovr.cmake	1970-01-01 00:00:00 +0000
+++ FindGcovr.cmake	2014-05-28 15:24:32 +0000
@@ -0,0 +1,43 @@
+# - Find gcovr scrip 
+# Will define:
+#
+# GCOVR_EXECUTABLE - the gcovr script
+#
+# Uses:
+#
+# GCOVR_ROOT - root to search for the script
+#
+# Copyright (C) 2011 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
+#
+# This file may be licensed under the terms of the
+# GNU Lesser General Public License Version 3 (the ``LGPL''),
+# or (at your option) any later version.
+#
+# Software distributed under the License is distributed
+# on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+# express or implied. See the LGPL for the specific language
+# governing rights and limitations.
+#
+# You should have received a copy of the LGPL along with this
+# program. If not, go to http://www.gnu.org/licenses/lgpl.html
+# or write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The development of this software was supported by:
+#   CoR-Lab, Research Institute for Cognition and Robotics
+#     Bielefeld University
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PROGRAM(GCOVR_EXECUTABLE gcovr
+             HINTS ${GCOVR_ROOT}
+                   "${GCOVR_ROOT}/bin"
+                   "${GCOVR_ROOT}/share/python"
+                   "/usr/share/python"
+                   "/usr/local/share/python"
+                   "${CMAKE_INSTALL_PREFIX}/share/python")
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(gcovr DEFAULT_MSG GCOVR_EXECUTABLE)
+
+# only visible in advanced view
+MARK_AS_ADVANCED(GCOVR_EXECUTABLE)
 
=== removed file 'Findgcovr.cmake'
--- Findgcovr.cmake	2014-05-27 12:26:14 +0000
+++ Findgcovr.cmake	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-# - Find gcovr scrip 
-# Will define:
-#
-# GCOVR_EXECUTABLE - the gcovr script
-#
-# Uses:
-#
-# GCOVR_ROOT - root to search for the script
-#
-# Copyright (C) 2011 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
-#
-# This file may be licensed under the terms of the
-# GNU Lesser General Public License Version 3 (the ``LGPL''),
-# or (at your option) any later version.
-#
-# Software distributed under the License is distributed
-# on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
-# express or implied. See the LGPL for the specific language
-# governing rights and limitations.
-#
-# You should have received a copy of the LGPL along with this
-# program. If not, go to http://www.gnu.org/licenses/lgpl.html
-# or write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The development of this software was supported by:
-#   CoR-Lab, Research Institute for Cognition and Robotics
-#     Bielefeld University
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PROGRAM(GCOVR_EXECUTABLE gcovr
-             HINTS ${GCOVR_ROOT}
-                   "${GCOVR_ROOT}/bin"
-                   "${GCOVR_ROOT}/share/python"
-                   "/usr/share/python"
-                   "/usr/local/share/python"
-                   "${CMAKE_INSTALL_PREFIX}/share/python")
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(gcovr DEFAULT_MSG GCOVR_EXECUTABLE)
-
-# only visible in advanced view
-MARK_AS_ADVANCED(GCOVR_EXECUTABLE)