Review comments

erslavin · erslavin · commit 5de71ec63e5f · 2025-08-21T06:28:12.000-04:00
diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py
@@ -1027,7 +1027,7 @@ def InstallTBB_Windows(context, force, buildArgs):
         CopyFiles(context, "cmake\\TBBConfig.cmake", "lib\\cmake\\TBB")
         CopyFiles(context, "cmake\\TBBConfigVersion.cmake", "lib\\cmake\\TBB")
 
-        PatchFile(os.path.join(context.instDir, "lib\\cmake\\TBB\\TBBConfig.cmake"),
+        PatchFile(os.path.join(context.instDir, "lib", "cmake", "TBB", "TBBConfig.cmake"),
                   [
                       (
                         "# TBBConfigVersion.cmake defines TBB_VERSION",
@@ -1170,7 +1170,7 @@ def _RunBuild(arch):
         CopyFiles(context, os.path.join(context.instDir, "cmake", "TBBConfigVersion.cmake"),
                   os.path.join(context.instDir, "lib", "cmake", "TBB"))
         
-        PatchFile(os.path.join(context.instDir, "lib/cmake/TBB/TBBConfig.cmake"),
+        PatchFile(os.path.join(context.instDir, "lib", "cmake", "TBB", "TBBConfig.cmake"),
             [
                 (
                     "# TBBConfigVersion.cmake defines TBB_VERSION",
@@ -1246,7 +1246,7 @@ def InstallTBB_Linux(context, force, buildArgs):
         CopyFiles(context, os.path.join(context.instDir, "cmake", "TBBConfigVersion.cmake"),
                   os.path.join(context.instDir, "lib", "cmake", "TBB"))
         
-        PatchFile(os.path.join(context.instDir, "lib/cmake/TBB/TBBConfig.cmake"),
+        PatchFile(os.path.join(context.instDir, "lib", "cmake", "TBB", "TBBConfig.cmake"),
             [
                 (
                     "# TBBConfigVersion.cmake defines TBB_VERSION",

Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,7 @@ def InstallTBB_Windows(context, force, buildArgs):`
`1027`	`1027`	`CopyFiles(context, "cmake\\TBBConfig.cmake", "lib\\cmake\\TBB")`
`1028`	`1028`	`CopyFiles(context, "cmake\\TBBConfigVersion.cmake", "lib\\cmake\\TBB")`
`1029`	`1029`
`1030`		`- PatchFile(os.path.join(context.instDir, "lib\\cmake\\TBB\\TBBConfig.cmake"),`
	`1030`	`+ PatchFile(os.path.join(context.instDir, "lib", "cmake", "TBB", "TBBConfig.cmake"),`
`1031`	`1031`	`[`
`1032`	`1032`	`(`
`1033`	`1033`	`"# TBBConfigVersion.cmake defines TBB_VERSION",`
`@@ -1170,7 +1170,7 @@ def _RunBuild(arch):`
`1170`	`1170`	`CopyFiles(context, os.path.join(context.instDir, "cmake", "TBBConfigVersion.cmake"),`
`1171`	`1171`	`os.path.join(context.instDir, "lib", "cmake", "TBB"))`
`1172`	`1172`
`1173`		`- PatchFile(os.path.join(context.instDir, "lib/cmake/TBB/TBBConfig.cmake"),`
	`1173`	`+ PatchFile(os.path.join(context.instDir, "lib", "cmake", "TBB", "TBBConfig.cmake"),`
`1174`	`1174`	`[`
`1175`	`1175`	`(`
`1176`	`1176`	`"# TBBConfigVersion.cmake defines TBB_VERSION",`
`@@ -1246,7 +1246,7 @@ def InstallTBB_Linux(context, force, buildArgs):`
`1246`	`1246`	`CopyFiles(context, os.path.join(context.instDir, "cmake", "TBBConfigVersion.cmake"),`
`1247`	`1247`	`os.path.join(context.instDir, "lib", "cmake", "TBB"))`
`1248`	`1248`
`1249`		`- PatchFile(os.path.join(context.instDir, "lib/cmake/TBB/TBBConfig.cmake"),`
	`1249`	`+ PatchFile(os.path.join(context.instDir, "lib", "cmake", "TBB", "TBBConfig.cmake"),`
`1250`	`1250`	`[`
`1251`	`1251`	`(`
`1252`	`1252`	`"# TBBConfigVersion.cmake defines TBB_VERSION",`