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/test | |
| 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/test')
| -rw-r--r-- | intern/cycles/test/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index a2a51dc47fd..3f64febf4df 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -12,7 +12,7 @@ set(INC .. ) -set(ALL_CYCLES_LIBRARIES +set(LIB cycles_kernel cycles_integrator cycles_scene @@ -22,9 +22,9 @@ set(ALL_CYCLES_LIBRARIES cycles_subd cycles_device cycles_util - extern_clew - ${CYCLES_GL_LIBRARIES} ) +cycles_external_libraries_append(LIB) + include_directories(${INC}) set(SRC @@ -59,6 +59,5 @@ if(NOT APPLE) endif() if(WITH_GTESTS) - BLENDER_SRC_GTEST(cycles "${SRC}" "${ALL_CYCLES_LIBRARIES}") - cycles_target_link_libraries(cycles_test) + BLENDER_SRC_GTEST(cycles "${SRC}" "${LIB}") endif() |