From fc1066ca9f0c07579212ab67c9a66e2f6f9f8d31 Mon Sep 17 00:00:00 2001
From: Branislav Brzak <branislav.brzak@amd.com>
Date: Mon, 27 May 2024 15:57:32 +0200
Subject: [PATCH] SWDEV-447357 - Implement test coverage report integration

Change-Id: I2dd0d375517e421493713106ab436b63222be5d6
---
 catch/CMakeLists.txt                        |  7 +++--
 utils/coverage/{Makefile => CMakeLists.txt} | 35 ++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)
 rename utils/coverage/{Makefile => CMakeLists.txt} (59%)

diff --git a/catch/CMakeLists.txt b/catch/CMakeLists.txt
index 43c830c6c1..2431d2a2bd 100644
--- a/catch/CMakeLists.txt
+++ b/catch/CMakeLists.txt
@@ -337,9 +337,10 @@ add_subdirectory(multiproc ${CATCH_BUILD_DIR}/multiproc)
 add_subdirectory(performance ${CATCH_BUILD_DIR}/performance)
 
 add_custom_target(gen_coverage
-                  COMMAND ${CMAKE_MAKE_PROGRAM} default_target
-                  COMMAND ./generateHipAPICoverage ${HIP_PATH}/include
-                  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../utils/coverage
+                  COMMAND ${CMAKE_COMMAND} -B build/
+                  COMMAND ${CMAKE_COMMAND} --build build/
+                  COMMAND ./build/generateHipAPICoverage ${HIP_PATH}/include
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../utils/coverage
                   COMMENT "Generating Test Coverage Report")
 
 cmake_policy(POP)
diff --git a/utils/coverage/Makefile b/utils/coverage/CMakeLists.txt
similarity index 59%
rename from utils/coverage/Makefile
rename to utils/coverage/CMakeLists.txt
index 0b579b7789..70561f702d 100644
--- a/utils/coverage/Makefile
+++ b/utils/coverage/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,24 +18,23 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-CC=g++
-CPPFLAGS=-std=c++17
-LDFLAGS=-lstdc++fs
-SRC=mainCoverage.cpp hipAPI.cpp hipAPIGroup.cpp reportGenerators.cpp hipAPICoverageUtils.cpp
-OBJ=generateHipAPICoverage
+cmake_minimum_required(VERSION 3.0)
+project(generateHipAPICoverage)
 
-default_target: all
-.PHONY : default_target
+set(CMAKE_CXX_STANDARD 17)
 
-all: ${OBJ}
+set(SRC
+    mainCoverage.cpp
+    hipAPI.cpp
+    hipAPIGroup.cpp
+    reportGenerators.cpp
+    hipAPICoverageUtils.cpp)
 
-${OBJ}: ${SRC}
-	@${CC} ${CPPFLAGS} $^ -o ${OBJ} ${LDFLAGS}
+add_executable(generateHipAPICoverage ${SRC})
 
-clean:
-	rm -f ${OBJ}
-	rm -f *.xml
-	rm -fr ./coverageReportHTML/testModules
-	rm -fr ./coverageReportHTML/testAPIs
-	rm -f ./coverageReportHTML/*.html
-.PHONY : clean
+add_custom_target(clean-cov-report
+    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_LIST_DIR}/*.xml
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_LIST_DIR}/coverageReportHTML/testModules
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_LIST_DIR}/coverageReportHTML/testAPIs
+    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_LIST_DIR}/coverageReportHTML/*.html
+)