From 0dc1517179a7b4ca4a35709f1810d80c8fef99a7 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Mon, 23 Sep 2024 12:23:55 -0700 Subject: [PATCH 1/2] Minor updates to formatting Signed-off-by: Jonathan Stone --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93af3a64d0..59afaca01e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -533,7 +533,7 @@ if (MATERIALX_BUILD_MONOLITHIC) # Conform cmake formats to zsh expected formats set(__embedded_build "false") if (MATERIALX_BUILD_APPLE_EMBEDDED) - set(__embedded_build "true") + set(__embedded_build "true") endif() # Install the Info.plist and shell script @@ -543,9 +543,7 @@ if (MATERIALX_BUILD_MONOLITHIC) # Run the shell script for the primary configuration install(CODE "execute_process(COMMAND zsh ${PROJECT_BINARY_DIR}/AppleFrameworkBuild.zsh )") - endif() - endif() endif() From b557ad6f4387eae534821bdb714be19e98ccffc0 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Mon, 23 Sep 2024 13:59:37 -0700 Subject: [PATCH 2/2] Use default constructor Signed-off-by: Jonathan Stone --- source/MaterialXFormat/Util.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/MaterialXFormat/Util.cpp b/source/MaterialXFormat/Util.cpp index 9cf9eb0b73..a934d8cf32 100644 --- a/source/MaterialXFormat/Util.cpp +++ b/source/MaterialXFormat/Util.cpp @@ -227,8 +227,7 @@ FileSearchPath getDefaultDataSearchPath() const FilePath REQUIRED_LIBRARY_FOLDER("libraries/targets"); FilePath currentPath = FilePath::getModulePath(); - FileSearchPath searchPath = FileSearchPath(); - + FileSearchPath searchPath; #if defined(BUILD_APPLE_FRAMEWORK) const FilePath FRAMEWORK_RESOURCES("Resources"); searchPath.append(FilePath::getSharedLibraryPath() / FRAMEWORK_RESOURCES);