diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f2ae2afbbc..d96309b0c2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,10 +32,10 @@ jobs:
python: 3.11
build_javascript: ON
- - name: Linux_GCC_13_Python312
+ - name: Linux_GCC_14_Python312
os: ubuntu-24.04
compiler: gcc
- compiler_version: "13"
+ compiler_version: "14"
python: 3.12
static_analysis: ON
cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
diff --git a/source/MaterialXCore/CMakeLists.txt b/source/MaterialXCore/CMakeLists.txt
index 8fc8767061..c3c845afda 100644
--- a/source/MaterialXCore/CMakeLists.txt
+++ b/source/MaterialXCore/CMakeLists.txt
@@ -1,4 +1,3 @@
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Generated.h.in ${CMAKE_CURRENT_BINARY_DIR}/Generated.h)
file(GLOB materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
@@ -10,11 +9,9 @@ mx_add_library(MaterialXCore
HEADER_FILES
${materialx_headers}
EXPORT_DEFINE
- MATERIALX_CORE_EXPORTS
-)
+ MATERIALX_CORE_EXPORTS)
# Need to add the binary directory to find the Generated.h file generated above.
target_include_directories(${TARGET_NAME}
PUBLIC
- $
-)
+ $)
diff --git a/source/MaterialXFormat/CMakeLists.txt b/source/MaterialXFormat/CMakeLists.txt
index e884e6bcbc..b58ab0b166 100644
--- a/source/MaterialXFormat/CMakeLists.txt
+++ b/source/MaterialXFormat/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -10,5 +9,4 @@ mx_add_library(MaterialXFormat
LIBRARIES
MaterialXCore
EXPORT_DEFINE
- MATERIALX_FORMAT_EXPORTS
-)
+ MATERIALX_FORMAT_EXPORTS)
diff --git a/source/MaterialXGenGlsl/CMakeLists.txt b/source/MaterialXGenGlsl/CMakeLists.txt
index 469d495e56..bd03965b62 100644
--- a/source/MaterialXGenGlsl/CMakeLists.txt
+++ b/source/MaterialXGenGlsl/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -11,5 +10,4 @@ mx_add_library(MaterialXGenGlsl
MaterialXGenShader
MaterialXCore
EXPORT_DEFINE
- MATERIALX_GENGLSL_EXPORTS
-)
+ MATERIALX_GENGLSL_EXPORTS)
diff --git a/source/MaterialXGenMdl/CMakeLists.txt b/source/MaterialXGenMdl/CMakeLists.txt
index ed11b30182..25e1e218a6 100644
--- a/source/MaterialXGenMdl/CMakeLists.txt
+++ b/source/MaterialXGenMdl/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -11,6 +10,4 @@ mx_add_library(MaterialXGenMdl
MaterialXGenShader
MaterialXCore
EXPORT_DEFINE
- MATERIALX_GENMDL_EXPORTS
-)
-
+ MATERIALX_GENMDL_EXPORTS)
diff --git a/source/MaterialXGenMsl/CMakeLists.txt b/source/MaterialXGenMsl/CMakeLists.txt
index 5f59f975e9..9dbfd666f7 100644
--- a/source/MaterialXGenMsl/CMakeLists.txt
+++ b/source/MaterialXGenMsl/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -11,5 +10,4 @@ mx_add_library(MaterialXGenMsl
MaterialXGenShader
MaterialXCore
EXPORT_DEFINE
- MATERIALX_GENMSL_EXPORTS
-)
+ MATERIALX_GENMSL_EXPORTS)
diff --git a/source/MaterialXGenOsl/CMakeLists.txt b/source/MaterialXGenOsl/CMakeLists.txt
index 35a416df12..398f390c64 100644
--- a/source/MaterialXGenOsl/CMakeLists.txt
+++ b/source/MaterialXGenOsl/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -11,5 +10,4 @@ mx_add_library(MaterialXGenOsl
MaterialXGenShader
MaterialXCore
EXPORT_DEFINE
- MATERIALX_GENOSL_EXPORTS
-)
+ MATERIALX_GENOSL_EXPORTS)
diff --git a/source/MaterialXGenShader/CMakeLists.txt b/source/MaterialXGenShader/CMakeLists.txt
index 597adba5fb..ebdf814234 100644
--- a/source/MaterialXGenShader/CMakeLists.txt
+++ b/source/MaterialXGenShader/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -11,5 +10,4 @@ mx_add_library(MaterialXGenShader
MaterialXFormat
MaterialXCore
EXPORT_DEFINE
- MATERIALX_GENSHADER_EXPORTS
-)
+ MATERIALX_GENSHADER_EXPORTS)
diff --git a/source/MaterialXGraphEditor/CMakeLists.txt b/source/MaterialXGraphEditor/CMakeLists.txt
index 7521ba9261..495213bfb6 100644
--- a/source/MaterialXGraphEditor/CMakeLists.txt
+++ b/source/MaterialXGraphEditor/CMakeLists.txt
@@ -80,10 +80,10 @@ set(MATERIALX_LIBRARIES
MaterialXGenGlsl
MaterialXRenderGlsl)
-if (APPLE)
+if(APPLE)
find_library(CORE_FOUNDATION Foundation REQUIRED)
list(APPEND MATERIALX_LIBRARIES ${CORE_FOUNDATION})
-endif ()
+endif()
target_link_libraries(
MaterialXGraphEditor
diff --git a/source/MaterialXRender/CMakeLists.txt b/source/MaterialXRender/CMakeLists.txt
index c0326153a4..d96fc203e7 100644
--- a/source/MaterialXRender/CMakeLists.txt
+++ b/source/MaterialXRender/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_inlined "${CMAKE_CURRENT_SOURCE_DIR}/*.inl")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -15,11 +14,13 @@ mx_add_library(MaterialXRender
LIBRARIES
MaterialXGenShader
EXPORT_DEFINE
- MATERIALX_RENDER_EXPORTS
-)
+ MATERIALX_RENDER_EXPORTS)
if(UNIX)
target_compile_options(${TARGET_NAME} PRIVATE -Wno-unused-function)
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ target_compile_options(${TARGET_NAME} PRIVATE -Wno-stringop-overflow)
+ endif()
endif()
if(MATERIALX_BUILD_OIIO)
diff --git a/source/MaterialXRenderGlsl/CMakeLists.txt b/source/MaterialXRenderGlsl/CMakeLists.txt
index 81c6bb75ad..2f0cefde1f 100644
--- a/source/MaterialXRenderGlsl/CMakeLists.txt
+++ b/source/MaterialXRenderGlsl/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.c*")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -24,7 +23,6 @@ elseif(UNIX)
find_package(OpenGL REQUIRED)
endif()
-
mx_add_library(MaterialXRenderGlsl
SOURCE_FILES
${materialx_source}
@@ -35,9 +33,7 @@ mx_add_library(MaterialXRenderGlsl
MaterialXGenGlsl
EXPORT_DEFINE
MATERIALX_RENDERGLSL_EXPORTS
- ADD_OBJECTIVE_C_CODE
-)
-
+ ADD_OBJECTIVE_C_CODE)
if(APPLE)
target_compile_definitions(${TARGET_NAME} PRIVATE -DGL_SILENCE_DEPRECATION)
diff --git a/source/MaterialXRenderHw/CMakeLists.txt b/source/MaterialXRenderHw/CMakeLists.txt
index 0a314e0749..ac9b20e2bf 100644
--- a/source/MaterialXRenderHw/CMakeLists.txt
+++ b/source/MaterialXRenderHw/CMakeLists.txt
@@ -15,7 +15,6 @@ elseif(UNIX)
endif()
endif()
-
mx_add_library(MaterialXRenderHw
SOURCE_FILES
${materialx_source}
@@ -25,8 +24,7 @@ mx_add_library(MaterialXRenderHw
MaterialXRender
EXPORT_DEFINE
MATERIALX_RENDERHW_EXPORTS
- ADD_OBJECTIVE_C_CODE
-)
+ ADD_OBJECTIVE_C_CODE)
if(APPLE)
target_link_libraries(
diff --git a/source/MaterialXRenderMsl/CMakeLists.txt b/source/MaterialXRenderMsl/CMakeLists.txt
index dedadb5a57..7807251ad9 100644
--- a/source/MaterialXRenderMsl/CMakeLists.txt
+++ b/source/MaterialXRenderMsl/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.m*")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -22,7 +21,6 @@ elseif(UNIX)
find_package(OpenGL REQUIRED)
endif()
-
mx_add_library(MaterialXRenderMsl
SOURCE_FILES
${materialx_source}
@@ -33,9 +31,7 @@ mx_add_library(MaterialXRenderMsl
MaterialXGenMsl
EXPORT_DEFINE
MATERIALX_RENDERMSL_EXPORTS
- ADD_OBJECTIVE_C_CODE
-)
-
+ ADD_OBJECTIVE_C_CODE)
if(APPLE)
target_compile_definitions(${TARGET_NAME} PRIVATE -DGL_SILENCE_DEPRECATION)
diff --git a/source/MaterialXRenderOsl/CMakeLists.txt b/source/MaterialXRenderOsl/CMakeLists.txt
index 04d735061a..033558fcaa 100644
--- a/source/MaterialXRenderOsl/CMakeLists.txt
+++ b/source/MaterialXRenderOsl/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
@@ -10,5 +9,4 @@ mx_add_library(MaterialXRenderOsl
LIBRARIES
MaterialXRender
EXPORT_DEFINE
- MATERIALX_RENDEROSL_EXPORTS
-)
+ MATERIALX_RENDEROSL_EXPORTS)
diff --git a/source/MaterialXView/CMakeLists.txt b/source/MaterialXView/CMakeLists.txt
index 9be0ab9ec0..e33a148bb3 100644
--- a/source/MaterialXView/CMakeLists.txt
+++ b/source/MaterialXView/CMakeLists.txt
@@ -68,7 +68,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
diff --git a/source/PyMaterialX/CMakeLists.txt b/source/PyMaterialX/CMakeLists.txt
index 2bbe2c9506..78fd9b58c4 100644
--- a/source/PyMaterialX/CMakeLists.txt
+++ b/source/PyMaterialX/CMakeLists.txt
@@ -1,8 +1,7 @@
include_directories(
${EXTERNAL_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/../
- ${CMAKE_CURRENT_SOURCE_DIR}
-)
+ ${CMAKE_CURRENT_SOURCE_DIR})
# Apply Python version and location requests from the user.
set(PYBIND11_PYTHON_VERSION ${MATERIALX_PYTHON_VERSION})