diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-04-06 23:25:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-04-07 20:52:53 +0300 |
| commit | 0de0950ad5d1de5172cbd2b6b0e67fe319a420c1 (patch) | |
| tree | 54a1a3e8abdb9733f5f9287496d03515c9ff5987 /intern/cycles/app | |
| parent | 51a7e4b488a4df1ce6fec93ee599d70efdbf5e03 (diff) | |
Cycles: various Linux build fixes related to Hydra render delegate
* Add missing GLEW and hgiGL libraries for Hydra
* Fix wrong case sensitive include
* Fix link errors by adding external libs to static Hydra lib
* Work around weird Hydra link error with MAX_SAMPLES
* Use Embree by default for Hydra
* Sync external libs code with standalone
* Update version number to match Blender
* Remove unneeded CLEW/GLEW from test executable
None of this should affect Cycles in Blender.
Ref T96731
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 484d99c5ca7..872a95ed5a6 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -11,7 +11,7 @@ set(INC set(INC_SYS ) -set(LIBRARIES +set(LIB cycles_device cycles_kernel cycles_scene @@ -33,27 +33,23 @@ if(WITH_ALEMBIC) endif() if(WITH_CYCLES_OSL) - list(APPEND LIBRARIES cycles_kernel_osl) + list(APPEND LIB cycles_kernel_osl) endif() if(CYCLES_STANDALONE_REPOSITORY) - list(APPEND LIBRARIES extern_sky) + list(APPEND LIB extern_sky) else() - list(APPEND LIBRARIES bf_intern_sky) + list(APPEND LIB bf_intern_sky) endif() if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) add_definitions(${GL_DEFINITIONS}) - list(APPEND INC_SYS - ${GLEW_INCLUDE_DIR} - ${SDL2_INCLUDE_DIRS} - ) - list(APPEND LIBRARIES - ${CYCLES_GL_LIBRARIES} - ${SDL2_LIBRARIES} - ) + list(APPEND INC_SYS ${GLEW_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS}) + list(APPEND LIB ${CYCLES_GL_LIBRARIES} ${CYCLES_GLEW_LIBRARIES} ${SDL2_LIBRARIES}) endif() +cycles_external_libraries_append(LIB) + # Common configuration. include_directories(${INC}) @@ -84,8 +80,7 @@ if(WITH_CYCLES_STANDALONE) add_executable(cycles ${SRC} ${INC} ${INC_SYS}) unset(SRC) - target_link_libraries(cycles ${LIBRARIES}) - cycles_target_link_libraries(cycles) + target_link_libraries(cycles PRIVATE ${LIB}) if(APPLE) if(WITH_OPENCOLORIO) @@ -128,9 +123,12 @@ if(WITH_CYCLES_CUBIN_COMPILER) set(INC ../../../extern/cuew/include ) + set(LIB + ) + cycles_external_libraries_append(LIB) add_executable(cycles_cubin_cc ${SRC}) include_directories(${INC}) - cycles_target_link_libraries(cycles_cubin_cc) + target_link_libraries(cycles_cubin_cc PRIVATE ${LIB}) unset(SRC) unset(INC) endif() |