cmake: Populate var CMAKE_GCOV

jeremybettis · nashif · commit 1fee4849bc5e · 2021-09-02T19:44:00.000-04:00
For each compiler, also set a CMAKE_GCOV var referencing the appropriate
gcov tool.

Tested with gcc and host-gcc on the ChromeOS codebase.

Signed-off-by: Jeremy Bettis &lt;jbettis@chromium.org&gt;
diff --git a/cmake/compiler/arcmwdt/generic.cmake b/cmake/compiler/arcmwdt/generic.cmake
@@ -19,6 +19,8 @@ if(NOT CMAKE_DTS_PREPROCESSOR)
 endif()
 
 find_program(CMAKE_C_COMPILER ${CROSS_COMPILE}ccac PATH ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_LLVM_COV ${CROSS_COMPILE}llvm-cov PATH ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
+set(CMAKE_GCOV "${CMAKE_LLVM_COV} gcov")
 
 if(CMAKE_C_COMPILER STREQUAL CMAKE_C_COMPILER-NOTFOUND)
   message(FATAL_ERROR "Zephyr was unable to find the Metaware compiler")
diff --git a/cmake/compiler/clang/generic.cmake b/cmake/compiler/clang/generic.cmake
@@ -5,4 +5,6 @@ if(DEFINED TOOLCHAIN_HOME)
 endif()
 
 find_program(CMAKE_C_COMPILER clang ${find_program_clang_args})
+find_program(CMAKE_LLVM_COV llvm-cov ${find_program_clang_args})
+set(CMAKE_GCOV "${CMAKE_LLVM_COV} gcov")
 
diff --git a/cmake/compiler/gcc/generic.cmake b/cmake/compiler/gcc/generic.cmake
@@ -3,6 +3,7 @@
 set_ifndef(CC gcc)
 
 find_program(CMAKE_C_COMPILER ${CROSS_COMPILE}${CC}   PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_GCOV ${CROSS_COMPILE}gcov   PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
 
 if(CMAKE_C_COMPILER STREQUAL CMAKE_C_COMPILER-NOTFOUND)
   message(FATAL_ERROR "Zephyr was unable to find the toolchain. Is the environment misconfigured?
diff --git a/cmake/compiler/host-gcc/generic.cmake b/cmake/compiler/host-gcc/generic.cmake
@@ -3,3 +3,4 @@
 # Configures CMake for using GCC
 
 find_program(CMAKE_C_COMPILER gcc)
+find_program(CMAKE_GCOV gcov)
diff --git a/cmake/compiler/xcc/generic.cmake b/cmake/compiler/xcc/generic.cmake
@@ -3,6 +3,7 @@
 set_ifndef(CC gcc)
 
 find_program(CMAKE_C_COMPILER ${CROSS_COMPILE}${CC}   PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_GCOV ${CROSS_COMPILE}gcov   PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
 
 if(CMAKE_C_COMPILER STREQUAL CMAKE_C_COMPILER-NOTFOUND)
   message(FATAL_ERROR "Zephyr was unable to find the toolchain. Is the environment misconfigured?

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@`
`3`	`3`	`# Configures CMake for using GCC`
`4`	`4`
`5`	`5`	`find_program(CMAKE_C_COMPILER gcc)`
	`6`	`+find_program(CMAKE_GCOV gcov)`