Merge pull request #9354 from NREL/fix_kiva_build_errors

Fix #9353 - Kiva build error on mac with clang >= 13
NREL · Mar 29, 2022 · ed759b1 · ed759b1 · nrel-bot-2 · Mar 29, 2022
2 parents fa02272 + b6b5e93
commit ed759b1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -75,11 +75,15 @@ elseif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" O
   target_compile_options(project_warnings INTERFACE -Wno-delete-non-virtual-dtor)
   target_compile_options(project_warnings INTERFACE -Wno-missing-braces)
   if(CMAKE_COMPILER_IS_GNUCXX) # g++
-    target_compile_options(project_warnings INTERFACE -Wno-unused-but-set-parameter -Wno-unused-but-set-variable)
     # Suppress unused-but-set warnings until more serious ones are addressed
+    target_compile_options(project_warnings INTERFACE -Wno-unused-but-set-parameter -Wno-unused-but-set-variable)
     target_compile_options(project_warnings INTERFACE -Wno-maybe-uninitialized)
     target_compile_options(project_warnings INTERFACE -Wno-aggressive-loop-optimizations)
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
+      # Suppress unused-but-set warnings until more serious ones are addressed
+      target_compile_options(project_warnings INTERFACE -Wno-unused-but-set-parameter -Wno-unused-but-set-variable)
+    endif()
     target_compile_options(project_warnings INTERFACE -Wno-vexing-parse)
     target_compile_options(project_warnings INTERFACE -Wno-invalid-source-encoding)
   endif()

diff --git a/third_party/kiva-ep/src/libkiva/Ground.cpp b/third_party/kiva-ep/src/libkiva/Ground.cpp
@@ -327,7 +327,8 @@ void Ground::calculateSurfaceAverages() {
     }
 
     double totalQ = 0.0;
-    double totalQc = 0.0, totalQr = 0.0;
+    double totalQc = 0.0;
+    // double totalQr = 0.0;
     double TA = 0;
     double hA = 0.0, hcA = 0.0, hrA = 0.0;
     double totalArea = 0.0;
@@ -368,7 +369,7 @@ void Ground::calculateSurfaceAverages() {
             hA += Ahc + Ahr;
 
             totalQc += Qc;
-            totalQr += Qr;
+            // totalQr += Qr;
             totalQ += Qc + Qr + q * A;
 
             TA += TNew[index] * A;

diff --git a/third_party/kiva-ep/src/libkiva/Ground.hpp b/third_party/kiva-ep/src/libkiva/Ground.hpp
@@ -26,6 +26,7 @@
 #pragma clang diagnostic push
 #if __clang_major__ >= 13
 #pragma clang diagnostic ignored "-Wdeprecated-copy"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 #elif defined(__GNUC__) && defined(__linux__)
 #pragma GCC diagnostic push