[Bf-blender-cvs] [e18ee59943d] epoxy: more GLEW remove
Christian Rauch
noreply at git.blender.org
Mon Jul 4 10:52:53 CEST 2022
Commit: e18ee59943d127e326c3af36e2631b613eb5fcfa
Author: Christian Rauch
Date: Tue Jun 28 01:20:34 2022 +0100
Branches: epoxy
https://developer.blender.org/rBe18ee59943d127e326c3af36e2631b613eb5fcfa
more GLEW remove
===================================================================
M intern/cycles/app/CMakeLists.txt
M intern/cycles/blender/CMakeLists.txt
M intern/cycles/device/CMakeLists.txt
M intern/cycles/hydra/CMakeLists.txt
M intern/ghost/CMakeLists.txt
M intern/ghost/test/CMakeLists.txt
M intern/glew-mx/CMakeLists.txt
M intern/opencolorio/CMakeLists.txt
M intern/opensubdiv/CMakeLists.txt
M source/blender/gpu/CMakeLists.txt
M source/blender/python/generic/CMakeLists.txt
M source/blender/python/gpu/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 6aea962eab5..4c9eb9a143c 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -44,8 +44,8 @@ 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 LIB ${CYCLES_GL_LIBRARIES} ${CYCLES_GLEW_LIBRARIES} ${SDL2_LIBRARIES})
+ list(APPEND INC_SYS ${SDL2_INCLUDE_DIRS})
+ list(APPEND LIB ${CYCLES_GL_LIBRARIES} ${SDL2_LIBRARIES})
endif()
cycles_external_libraries_append(LIB)
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 4919b99cfe0..d8f6cf3d86f 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
set(INC_SYS
${PYTHON_INCLUDE_DIRS}
- ${GLEW_INCLUDE_DIR}
)
set(SRC
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 6418801c572..86ece4ccdd3 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -6,9 +6,7 @@ set(INC
../../glew-mx
)
-set(INC_SYS
- ${GLEW_INCLUDE_DIR}
-)
+set(INC_SYS )
if(WITH_CYCLES_DEVICE_OPTIX OR WITH_CYCLES_DEVICE_CUDA)
if(WITH_CUDA_DYNLOAD)
diff --git a/intern/cycles/hydra/CMakeLists.txt b/intern/cycles/hydra/CMakeLists.txt
index aa194fb936e..e7c2e0dafa9 100644
--- a/intern/cycles/hydra/CMakeLists.txt
+++ b/intern/cycles/hydra/CMakeLists.txt
@@ -10,14 +10,12 @@ set(INC
)
set(INC_SYS
${USD_INCLUDE_DIRS}
- ${GLEW_INCLUDE_DIR}
)
set(LIB
cycles_scene
cycles_session
cycles_graph
- ${CYCLES_GLEW_LIBRARIES}
)
cycles_external_libraries_append(LIB)
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 6a11d00cbc4..02d9bb8db8e 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -8,9 +8,7 @@ set(INC
../../source/blender/makesdna
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
+set(INC_SYS )
set(SRC
intern/GHOST_Buttons.cpp
@@ -69,7 +67,6 @@ set(SRC
set(LIB
bf_intern_glew_mx
- ${GLEW_LIBRARY}
)
if(WITH_GHOST_DEBUG)
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index 9cc406313c7..afebb8e7786 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -217,21 +217,12 @@ endif()
if(UNIX AND NOT APPLE)
find_package(X11 REQUIRED)
- find_package(GLEW)
-
- if(NOT GLEW_FOUND)
- message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW")
- endif()
set(PLATFORM_LINKLIBS
${X11_X11_LIB}
${X11_Xinput_LIB}
- ${GLEW_LIBRARY}
-lpthread
)
-else()
- # set(GLEW_LIBRARY "") # unused
- set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
endif()
string(APPEND CMAKE_C_FLAGS " ${PLATFORM_CFLAGS}")
diff --git a/intern/glew-mx/CMakeLists.txt b/intern/glew-mx/CMakeLists.txt
index 49e9762672f..ebfe8ad2f73 100644
--- a/intern/glew-mx/CMakeLists.txt
+++ b/intern/glew-mx/CMakeLists.txt
@@ -5,9 +5,7 @@ set(INC
.
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
+set(INC_SYS )
set(SRC
intern/glew-mx.c
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt
index be6ccc5c2c5..dd4297e6e28 100644
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -37,7 +37,6 @@ if(WITH_OPENCOLORIO)
list(APPEND INC_SYS
${OPENCOLORIO_INCLUDE_DIRS}
- ${GLEW_INCLUDE_PATH}
)
list(APPEND SRC
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index bb3aa16a9fe..7d15936d0a0 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -29,7 +29,6 @@ if(WITH_OPENSUBDIV)
list(APPEND INC_SYS
${OPENSUBDIV_INCLUDE_DIRS}
- ${GLEW_INCLUDE_PATH}
)
list(APPEND SRC
@@ -100,7 +99,6 @@ if(WITH_OPENSUBDIV)
OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_COMPUTE)
add_definitions(${GL_DEFINITIONS})
- add_definitions(-DOSD_USES_GLEW)
if(WIN32)
add_definitions(-DNOMINMAX)
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 9b5ce6e147e..96194e63f61 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -39,9 +39,7 @@ set(INC
../../../intern/mantaflow/extern
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
+set(INC_SYS )
set(SRC
intern/gpu_batch.cc
@@ -223,12 +221,6 @@ set(LIB
${BLENDER_GL_LIBRARIES}
)
-if(NOT WITH_SYSTEM_GLEW)
- list(APPEND LIB
- ${BLENDER_GLEW_LIBRARIES}
- )
-endif()
-
set(MSL_SRC
metal/kernels/compute_texture_update.msl
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 69bcfdfae4e..815e3be8d26 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
)
set(INC_SYS
- ${GLEW_INCLUDE_PATH}
${PYTHON_INCLUDE_DIRS}
)
@@ -41,7 +40,6 @@ set(SRC
)
set(LIB
- ${GLEW_LIBRARY}
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
)
diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt
index 8ccb29beb13..575c4a38e80 100644
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
)
set(INC_SYS
- ${GLEW_INCLUDE_PATH}
${PYTHON_INCLUDE_DIRS}
)
More information about the Bf-blender-cvs
mailing list