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/cmake/macros.cmake | |
| 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/cmake/macros.cmake')
| -rw-r--r-- | intern/cycles/cmake/macros.cmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index cd1db8e95a9..abadfc2c1ac 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -74,6 +74,19 @@ macro(cycles_add_library target library_deps) endmacro() macro(cycles_external_libraries_append libraries) + if(APPLE) + list(APPEND ${libraries} "-framework Foundation") + if(WITH_USD) + list(APPEND ${libraries} "-framework CoreVideo -framework Cocoa") + endif() + if(WITH_CYCLES_STANDALONE_GUI OR WITH_USD) + list(APPEND ${libraries} "-framework OpenGL") + endif() + elseif(UNIX) + if(WITH_USD) + list(APPEND ${libraries} "X11") + endif() + endif() if(WITH_CYCLES_LOGGING) list(APPEND ${libraries} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES}) endif() @@ -90,6 +103,7 @@ macro(cycles_external_libraries_append libraries) list(APPEND ${libraries} ${OPENCOLORIO_LIBRARIES}) if(APPLE) list(APPEND ${libraries} "-framework IOKit") + list(APPEND ${libraries} "-framework Carbon") endif() endif() if(WITH_OPENVDB) |