Commit a41a857
committed
Conan related fixes
- CONAN_USER_HOME in Conan 1 replaced by CONAN_HOME in Conan 2, replace with ASWF_CONAN_HOME
to avoid ambiguity
- fix up Python sysconfig directories when installing for outside Conan use
- tell PySide to look for libpython in lib64
Signed-off-by: Jean-Francois Panisset <[email protected]>1 parent 346017d commit a41a857
File tree
23 files changed
+76
-41
lines changed- ci-baseqt
- ci-base
- ci-common
- ci-materialx
- ci-ocio
- ci-oiio
- ci-opencue
- ci-openexr
- ci-openrv
- ci-openvdb
- ci-osl
- ci-otio
- ci-usd
- ci-vfxall
- packages
- common
- conan/recipes/pyside
- patches
- python/aswfdocker
- data
- scripts/common
23 files changed
+76
-41
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
370 | 370 | | |
371 | 371 | | |
372 | 372 | | |
373 | | - | |
| 373 | + | |
374 | 374 | | |
375 | | - | |
376 | | - | |
| 375 | + | |
| 376 | + | |
377 | 377 | | |
378 | 378 | | |
379 | 379 | | |
380 | 380 | | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
381 | 384 | | |
382 | 385 | | |
383 | 386 | | |
| |||
388 | 391 | | |
389 | 392 | | |
390 | 393 | | |
391 | | - | |
| 394 | + | |
392 | 395 | | |
393 | 396 | | |
394 | 397 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments