[Bf-blender-cvs] [cfb7664d5b4] blender-v2.83-release: Fix: build error due to missing definitions
Jacques Lucke
noreply at git.blender.org
Tue May 19 17:37:32 CEST 2020
Commit: cfb7664d5b48d5b5dcb60f47fc6237cdb2be7cb1
Author: Jacques Lucke
Date: Tue May 19 17:36:40 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBcfb7664d5b48d5b5dcb60f47fc6237cdb2be7cb1
Fix: build error due to missing definitions
Reviewers: sergey, brecht
Differential Revision: https://developer.blender.org/D7787
===================================================================
M intern/opensubdiv/CMakeLists.txt
M source/blender/draw/CMakeLists.txt
M source/blender/render/CMakeLists.txt
===================================================================
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index e7292872e9c..c411e58be35 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -105,8 +105,8 @@ if(WITH_OPENSUBDIV)
data_to_c_simple(shader/gpu_shader_opensubdiv_geometry.glsl SRC)
data_to_c_simple(shader/gpu_shader_opensubdiv_fragment.glsl SRC)
- add_definitions(-DGLEW_STATIC)
add_definitions(-DOSD_USES_GLEW)
+ add_definitions(${GL_DEFINITIONS})
if(WIN32)
add_definitions(-DNOMINMAX)
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 6f932bf8797..0214a8e1887 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -401,4 +401,6 @@ if(WITH_XR_OPENXR)
add_definitions(-DWITH_XR_OPENXR)
endif()
+add_definitions(${GL_DEFINITIONS})
+
blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index a1dd9b3d5b0..f49c68a258d 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -108,4 +108,6 @@ if(APPLE)
endif()
endif()
+add_definitions(${GL_DEFINITIONS})
+
blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
More information about the Bf-blender-cvs
mailing list