Merge remote-tracking branch 'dhruv/framework' into framework

AcademySoftwareFoundation · Sep 23, 2024 · c7c4ab0 · c7c4ab0
2 parents d43c48b + b557ad6
commit c7c4ab0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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()
 

diff --git a/source/MaterialXFormat/Util.cpp b/source/MaterialXFormat/Util.cpp
@@ -231,8 +231,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");