diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-04-07 21:33:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-04-07 21:33:34 +0300 |
| commit | aaa5a80763ee7669d84741f936f24560984f5df3 (patch) | |
| tree | 2a6e980e539abed37d4592e0ac2ab7425fa6ae74 /intern | |
| parent | 0de0950ad5d1de5172cbd2b6b0e67fe319a420c1 (diff) | |
Fix Cycles build error after recent changes
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 0924b83201f..05c0980bdfb 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -534,9 +534,9 @@ endif() # GLEW ########################################################################### -if((WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) OR - WITH_CYCLES_HYDRA_RENDER_DELEGATE) - if(CYCLES_STANDALONE_REPOSITORY) +if(CYCLES_STANDALONE_REPOSITORY) + if((WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) OR + WITH_CYCLES_HYDRA_RENDER_DELEGATE) if(MSVC AND EXISTS ${_cycles_lib_dir}) set(GLEW_LIBRARY "${_cycles_lib_dir}/opengl/lib/glew.lib") set(GLEW_INCLUDE_DIR "${_cycles_lib_dir}/opengl/include") @@ -546,11 +546,11 @@ if((WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) OR endif() set(CYCLES_GLEW_LIBRARIES ${GLEW_LIBRARY}) - else() - # Workaround for unconventional variable name use in Blender. - set(GLEW_INCLUDE_DIR "${GLEW_INCLUDE_PATH}") - set(CYCLES_GLEW_LIBRARIES bf_intern_glew_mx ${BLENDER_GLEW_LIBRARIES}) endif() +else() + # Workaround for unconventional variable name use in Blender. + set(GLEW_INCLUDE_DIR "${GLEW_INCLUDE_PATH}") + set(CYCLES_GLEW_LIBRARIES bf_intern_glew_mx ${BLENDER_GLEW_LIBRARIES}) endif() ########################################################################### |