Merge ign-cmake2 ➡️ main

Changelog.md

@@ -1,5 +1,34 @@
 ## Gazebo CMake 2.x
 
+### Gazebo CMake 2.14.0 (2022-07-25)
+
+1. Add code coverage ignore file
+    * [Pull request #279](https://github.com/gazebosim/gz-cmake/pull/279)
+
+### Gazebo CMake 2.13.0 (2022-07-22)
+
+1. Backport `GZ_DESIGNATION` tick-tock
+    * [Pull request #284](https://github.com/gazebosim/gz-cmake/pull/284)
+
+1. Upload docs to an s3 bucket based only on the major version
+    * [Pull request #281](https://github.com/gazebosim/gz-cmake/pull/281)
+
+1. Exclude proto generated cpp in coverage test
+    * [Pull request #272](https://github.com/gazebosim/gz-cmake/pull/272)
+
+1. Add LTCG flag on Windows builds
+    * [Pull request #251](https://github.com/gazebosim/gz-cmake/pull/251)
+
+1. Update codeowners
+    * [Pull request #261](https://github.com/gazebosim/gz-cmake/pull/261)
+    * [Pull request #237](https://github.com/gazebosim/gz-cmake/pull/237)
+
+1. Update documentation to gazebosim.org
+    * [Pull request #248](https://github.com/gazebosim/gz-cmake/pull/248)
+
+1. Improving CONFIG test
+    * [Pull request #235](https://github.com/gazebosim/gz-cmake/pull/235)
+
 ### Gazebo CMake 2.12.1 (2022-04-12)
 
 1. Allow to recreate targets created by GzPkgConfig

cmake/GzCodeCoverage.cmake

@@ -120,6 +120,17 @@ FUNCTION(gz_setup_target_for_coverage)
     MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
   ENDIF() # NOT GENHTML_PATH
 
+  # Read ignore file list
+  if (EXISTS "${PROJECT_SOURCE_DIR}/coverage.ignore.in")
+    configure_file("${PROJECT_SOURCE_DIR}/coverage.ignore.in"
+                    ${PROJECT_BINARY_DIR}/coverage.ignore)
+    file (STRINGS "${PROJECT_BINARY_DIR}/coverage.ignore" IGNORE_LIST_RAW)
+    string(REGEX REPLACE "([^;]+)" "'${PROJECT_SOURCE_DIR}/\\1'" IGNORE_LIST "${IGNORE_LIST_RAW}")
+    message(STATUS "Ignore coverage additions: " ${IGNORE_LIST})
+  else()
+    set(IGNORE_LIST "")
+  endif()
+
   # Setup target
   ADD_CUSTOM_TARGET(${_targetname}
 
@@ -132,8 +143,8 @@ FUNCTION(gz_setup_target_for_coverage)
     # Remove negative counts
     COMMAND sed -i '/,-/d' ${_outputname}.info
     COMMAND ${LCOV_PATH} ${_branch_flags} -q
-      --remove ${_outputname}.info '*/test/*' '/usr/*' '*_TEST*' '*.cxx' 'moc_*.cpp' 'qrc_*.cpp' '*.pb.*' --output-file ${_outputname}.info.cleaned
-    COMMAND ${GENHTML_PATH} ${_branch_flags} -q
+      --remove ${_outputname}.info '*/test/*' '/usr/*' '*_TEST*' '*.cxx' 'moc_*.cpp' 'qrc_*.cpp' '*.pb.*' '*/build/*' '*/install/*' ${IGNORE_LIST} --output-file ${_outputname}.info.cleaned
+    COMMAND ${GENHTML_PATH} ${_branch_flags} -q --prefix ${PROJECT_SOURCE_DIR}
     --legend -o ${_outputname} ${_outputname}.info.cleaned
     COMMAND ${LCOV_PATH} --summary ${_outputname}.info.cleaned 2>&1 | grep "lines" | cut -d ' ' -f 4 | cut -d '%' -f 1 > ${_outputname}/lines.txt
     COMMAND ${LCOV_PATH} --summary ${_outputname}.info.cleaned 2>&1 | grep "functions" | cut -d ' ' -f 4 | cut -d '%' -f 1 > ${_outputname}/functions.txt

cmake/gz-config.cmake.in

@@ -176,4 +176,4 @@ endforeach()
 set(@PROJECT_NAME_NO_VERSION_UPPER@_DOXYGEN_TAGFILE "${PACKAGE_PREFIX_DIR}/@GZ_DATA_INSTALL_DIR@/@[email protected]")
 
 # Specify the API url. This is where the doxygen tag file will resolve URLS to.
-set(@PROJECT_NAME_NO_VERSION_UPPER@_API_URL "https://gazebosim.org/api/@GZ_DESIGNATION@/@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@")
+set(@PROJECT_NAME_NO_VERSION_UPPER@_API_URL "https://gazebosim.org/api/@GZ_DESIGNATION@/@PROJECT_VERSION_MAJOR@")

cmake/upload_doc.sh.in

@@ -20,7 +20,7 @@ if [ ! -f "@CMAKE_BINARY_DIR@/doxygen/html/index.html" ]; then
 fi
 
 # Dry run
-aws s3 sync --dryrun @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@GZ_DESIGNATION@/@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@/
+aws s3 sync --dryrun @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@GZ_DESIGNATION@/@PROJECT_VERSION_MAJOR@/
 
 if [ -z "$1" ]; then
   echo -n "Upload (Y/n)? "
@@ -32,7 +32,7 @@ fi
 if [ "$ans" = "n" ] || [ "$ans" = "N" ]; then
   exit 1
 else
-  aws s3 sync @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@GZ_DESIGNATION@/@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@/
+  aws s3 sync @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@GZ_DESIGNATION@/@PROJECT_VERSION_MAJOR@/
 
   echo "WARNING"
   echo "  A CloudFront invalidation is required. Run the following command with the appropriate \$CLOUDFRONT_DISTRIBUTION_ID:\n"