diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-04-07 21:27:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-04-29 20:03:06 +0300 |
| commit | 060a50a5f72a0ccdb754bf155aa2ed394a1bcda5 (patch) | |
| tree | 813b0d519df9f4bed79f5e267664204e874db2ee /intern/cycles/app | |
| parent | 074a8558b7b320d7be78d436ab5473fd5b53ff56 (diff) | |
Cycles: refactor Hydra render delegate building
* Leave code for building the render delegate against other applications and
their USD libraries to the Cycles repository, since this is not a great fit.
In the Blender repository, always use Blender's USD libraries now that they
include Hydra support.
* Hide non-USD symbols from the hdCycles shared library, to avoid library
version conflicts.
* Share Apple framework linking between the standalone app and plugin.
* Add cycles_hydra module, to be shared between the standalone app and plugin.
* Bring external libs code in sync with standalone repo, adding various missing
libraries.
* Move some cmake include directories to the top level cycles source folder
because we need to control their global order, to ensure we link against the
correct headers with mixed Blender libraries and external USD libraries.
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 872a95ed5a6..6aea962eab5 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -83,13 +83,6 @@ if(WITH_CYCLES_STANDALONE) target_link_libraries(cycles PRIVATE ${LIB}) if(APPLE) - if(WITH_OPENCOLORIO) - set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS " -framework IOKit -framework Carbon") - endif() - if(WITH_OPENIMAGEDENOISE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") - # OpenImageDenoise uses BNNS from the Accelerate framework. - set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS " -framework Accelerate") - endif() if(WITH_CYCLES_STANDALONE_GUI) set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS " -framework Cocoa -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework ForceFeedback -framework CoreVideo") @@ -103,6 +96,10 @@ if(WITH_CYCLES_STANDALONE) if(CYCLES_STANDALONE_REPOSITORY) cycles_install_libraries(cycles) endif() + + install(PROGRAMS + $<TARGET_FILE:cycles> + DESTINATION ${CMAKE_INSTALL_PREFIX}) endif() ##################################################################### |