Gcov is part of gcc

HDFGroup · Oct 8, 2024 · bfbcd28 · bfbcd28
1 parent 8baeb09
commit bfbcd28
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/cmake-analysis.yml b/.github/workflows/cmake-analysis.yml
@@ -31,9 +31,8 @@ jobs:
     steps:
     - name: Install CMake Dependencies (Linux_coverage)
       run: |
-        sudo apt-get update
-        sudo apt-get install ninja-build doxygen graphviz curl libncurses5
-        sudo apt-get install gcov -q -y
+        sudo apt update
+        sudo apt-get install ninja-build doxygen graphviz curl libncurses5 build-essential
         sudo apt-get install lcov -q -y
 
     - name: Set file base name (Linux_coverage)
@@ -123,7 +122,7 @@ jobs:
     steps:
       - name: Install CMake Dependencies (Linux_Leak)
         run: |
-          sudo apt-get update
+          sudo apt update
           sudo apt-get install ninja-build doxygen graphviz curl libncurses5
 
       - name: add clang to env
@@ -219,7 +218,7 @@ jobs:
     steps:
       - name: Install CMake Dependencies (Linux_Address)
         run: |
-          sudo apt-get update
+          sudo apt update
           sudo apt-get install ninja-build doxygen graphviz curl libncurses5
 
       - name: add clang to env

diff --git a/config/cmake/JPEG/CMakeLists.txt b/config/cmake/JPEG/CMakeLists.txt
@@ -217,7 +217,10 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
   target_compile_options(${JPEG_LIB_TARGET} PRIVATE -Wno-strict-prototypes)
 endif ()
 if (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-  target_compile_options(${JPEG_LIB_TARGET} PRIVATE -Wno-deprecated-non-prototype -Wno-strict-prototypes -Wno-implicit-function-declaration -Wno-typedef-redefinition)
+  target_compile_options(${JPEG_LIB_TARGET} PRIVATE -Wno-deprecated-non-prototype -Wno-strict-prototypes)
+endif ()
+if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+  target_compile_options(${JPEG_LIB_TARGET} PRIVATE -Wno-implicit-function-declaration -Wno-typedef-redefinition)
 endif ()
 if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
   target_compile_options(${JPEG_LIB_TARGET} PRIVATE -fmessage-length=0)

diff --git a/hdf/src/CMakeLists.txt b/hdf/src/CMakeLists.txt
@@ -129,6 +129,9 @@ if (BUILD_STATIC_LIBS)
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF4_HDF_BINARY_DIR}>"
   )
   target_compile_options(${HDF4_SRC_LIB_TARGET} PRIVATE "${HDF4_CMAKE_C_FLAGS}")
+  if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    target_compile_options(${HDF4_SRC_LIB_TARGET} PRIVATE -Wno-implicit-function-declaration -Wno-typedef-redefinition)
+  endif ()
   target_compile_definitions(${HDF4_SRC_LIB_TARGET}
       PUBLIC
           ${HDF_EXTRA_C_FLAGS}
@@ -158,6 +161,9 @@ if (BUILD_SHARED_LIBS)
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF4_HDF_BINARY_DIR}>"
   )
   target_compile_options(${HDF4_SRC_LIBSH_TARGET} PRIVATE "${HDF4_CMAKE_C_FLAGS}")
+  if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    target_compile_options(${HDF4_SRC_LIBSH_TARGET} PRIVATE -Wno-implicit-function-declaration -Wno-typedef-redefinition)
+  endif ()
   target_compile_definitions(${HDF4_SRC_LIBSH_TARGET}
       PUBLIC
           ${HDF_EXTRA_C_FLAGS}