Backport GCC 14 pipeline fixes

Remove Apple Clang dynamic analysis build from workflows. Was introduced in 1.39, requires many updates.
autodesk-forks · Oct 25, 2024 · a794b16 · a794b16
1 parent e86e71c
commit a794b16
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -83,20 +83,12 @@ jobs:
           python: 3.12
           test_shaders: ON
 
-        - name: MacOS_Xcode_DynamicAnalysis
-          os: macos-14
-          compiler: xcode
-          compiler_version: "15.4"
-          python: None
-          dynamic_analysis: ON
-          cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
-
         - name: iOS_Xcode_15
           os: macos-14
           compiler: xcode
           compiler_version: "15.4"
           python: None
-          cmake_config: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path` -DCMAKE_OSX_ARCHITECTURES=arm64
+          cmake_config: -DMATERIALX_BUILD_IOS=ON -DCMAKE_OSX_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path` -DCMAKE_OSX_ARCHITECTURES=arm64
 
         - name: Windows_VS2019_Win32_Python37
           os: windows-2019

diff --git a/source/MaterialXRender/CMakeLists.txt b/source/MaterialXRender/CMakeLists.txt
@@ -18,6 +18,9 @@ assign_source_group("Header Files" ${materialx_headers})
 
 if(UNIX)
     add_compile_options(-Wno-unused-function)
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        target_compile_options(${TARGET_NAME} PRIVATE -Wno-stringop-overflow)
+    endif()
 endif()
 
 add_library(${MATERIALX_MODULE_NAME} ${materialx_source} ${materialx_headers} ${materialx_inlined})

diff --git a/source/MaterialXView/CMakeLists.txt b/source/MaterialXView/CMakeLists.txt
@@ -70,7 +70,7 @@ else()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         add_compile_options(-Wno-deprecated)
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        add_compile_options(-Wno-format-truncation -Wno-use-after-free)
+        add_compile_options(-Wno-format-truncation -Wno-stringop-overflow -Wno-use-after-free)
     endif()
 
     # Disable NanoGUI compiler modifications for Clang