Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt17
1 files changed, 6 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5b19096506..509de9943e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -925,7 +925,7 @@ if(WITH_GL_PROFILE_ES20)
)
endif()
- list(APPEND BLENDER_GL_LIBRARIES OPENGLES_LIBRARY)
+ list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}")
else()
set(OPENGLES_LIBRARY "" CACHE FILEPATH "OpenGL ES 2.0 library file")
@@ -985,7 +985,10 @@ else()
endif()
if(WITH_GL_EGL)
- list(APPEND GL_DEFINITIONS -DWITH_GL_EGL)
+ find_package(OpenGL REQUIRED EGL)
+ list(APPEND BLENDER_GL_LIBRARIES OpenGL::EGL)
+
+ list(APPEND GL_DEFINITIONS -DWITH_GL_EGL -DGLEW_EGL -DGLEW_INC_EGL)
if(WITH_SYSTEM_GLES)
if(NOT OPENGLES_EGL_LIBRARY)
@@ -995,7 +998,7 @@ if(WITH_GL_EGL)
)
endif()
- list(APPEND BLENDER_GL_LIBRARIES OPENGLES_EGL_LIBRARY)
+ list(APPEND BLENDER_GL_LIBRARIES ${OPENGLES_EGL_LIBRARY})
else()
set(OPENGLES_EGL_LIBRARY "" CACHE FILEPATH "EGL library file")
@@ -1035,10 +1038,6 @@ else()
list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
endif()
-if(WITH_GL_EGL)
- list(APPEND GL_DEFINITIONS -DWITH_EGL)
-endif()
-
#-----------------------------------------------------------------------------
# Configure OpenMP.
if(WITH_OPENMP)
@@ -1110,10 +1109,6 @@ else()
list(APPEND GL_DEFINITIONS -DGL_ES_VERSION_1_0=0 -DGL_ES_VERSION_CL_1_1=0 -DGL_ES_VERSION_CM_1_1=0)
endif()
- if(WITH_GL_EGL)
- list(APPEND GL_DEFINITIONS -DGLEW_INC_EGL)
- endif()
-
set(BLENDER_GLEW_LIBRARIES extern_glew_es bf_intern_glew_mx)
else()