[Bf-blender-cvs] [c8b78bfa8e7] temp-T96710-pbvh-pixels: Fix Cycles build error after recent changes
Brecht Van Lommel
noreply at git.blender.org
Fri Apr 8 11:07:49 CEST 2022
Commit: c8b78bfa8e7f11eb7af8f57694243f2e152f4ec2
Author: Brecht Van Lommel
Date: Thu Apr 7 20:33:34 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rBc8b78bfa8e7f11eb7af8f57694243f2e152f4ec2
Fix Cycles build error after recent changes
===================================================================
M intern/cycles/cmake/external_libs.cmake
===================================================================
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()
###########################################################################
More information about the Bf-blender-cvs
mailing list