OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0032242: Configuration, CMake - USE_GLES2 option does not appear in interactive configurator

Browse Source 
USE_D3D, USE_OPENGL and USE_GLES2 options declarations have been reordered.
This commit is contained in:
kgv 2021-03-24 00:26:16 +03:00 committed by bugmaster
parent bff660919f
commit bbc5899a8c
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
CMakeLists.txt
View File

@ -366,10 +366,14 @@ endif()
# whether use optional 3rdparty or not # whether use optional 3rdparty or not
if (APPLE) if (APPLE)
set (USE_GLX OFF CACHE BOOL "${USE_GLX_DESCR}") set (USE_GLX OFF CACHE BOOL "${USE_GLX_DESCR}")
else()
set (USE_GLX OFF)
endif() endif()
if (WIN32) if (WIN32)
set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}") set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}")
else()
set (USE_D3D OFF)
endif() endif()
# Enable/Disable the floating point exceptions (FPE) during runtime. # Enable/Disable the floating point exceptions (FPE) during runtime.
@ -383,6 +387,15 @@ else()
set (BUILD_ENABLE_FPE_SIGNAL_HANDLER 0) set (BUILD_ENABLE_FPE_SIGNAL_HANDLER 0)
endif() endif()
# OpenGL
if (ANDROID OR IOS OR EMSCRIPTEN OR "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
set (USE_OPENGL OFF)
set (USE_GLES2 ON)
else()
set (USE_OPENGL ON CACHE BOOL "${USE_OPENGL_DESCR}")
set (USE_GLES2 OFF CACHE BOOL "${USE_GLES2_DESCR}")
endif()
# include the patched or original list of modules # include the patched or original list of modules
# list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits # list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
# list <OCCT_MODULES> will contain all modules # list <OCCT_MODULES> will contain all modules
@ -414,19 +427,6 @@ if (NOT DEFINED BUILD_DOC_Overview)
set (BUILD_DOC_Overview ${CAN_DOXYGEN_BE_USED} CACHE BOOL "${BUILD_DOC_Overview_DESCR}") set (BUILD_DOC_Overview ${CAN_DOXYGEN_BE_USED} CACHE BOOL "${BUILD_DOC_Overview_DESCR}")
endif() endif()
if (ANDROID OR IOS OR EMSCRIPTEN OR "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
list (REMOVE_ITEM Visualization_TOOLKITS TKOpenGl)
list (REMOVE_ITEM Draw_TOOLKITS TKOpenGlTest)
elseif (NOT USE_GLES2)
list (REMOVE_ITEM Visualization_TOOLKITS TKOpenGles)
list (REMOVE_ITEM Draw_TOOLKITS TKOpenGlesTest)
endif()
if (NOT USE_D3D)
list (REMOVE_ITEM Visualization_TOOLKITS TKD3DHost)
list (REMOVE_ITEM Draw_TOOLKITS TKD3DHostTest)
endif()
# accumulate used toolkits (first level) in BUILD_TOOLKITS variable # accumulate used toolkits (first level) in BUILD_TOOLKITS variable
list (APPEND BUILD_TOOLKITS ${BUILD_ADDITIONAL_TOOLKITS}) list (APPEND BUILD_TOOLKITS ${BUILD_ADDITIONAL_TOOLKITS})
@ -542,14 +542,6 @@ else()
endif() endif()
endif() endif()
# D3D
if (USE_D3D)
add_definitions (-DHAVE_D3D)
#if(MSVC_VERSION LESS 1700)
#OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/d3d")
#endif()
endif()
# GLX # GLX
if (USE_GLX) if (USE_GLX)
add_definitions (-DMACOSX_USE_GLX) add_definitions (-DMACOSX_USE_GLX)
@ -557,7 +549,6 @@ if (USE_GLX)
endif() endif()
# FREEIMAGE # FREEIMAGE
if (CAN_USE_FREEIMAGE) if (CAN_USE_FREEIMAGE)
set (USE_FREEIMAGE OFF CACHE BOOL "${USE_FREEIMAGE_DESCR}") set (USE_FREEIMAGE OFF CACHE BOOL "${USE_FREEIMAGE_DESCR}")
@ -618,9 +609,11 @@ endif()
# OpenGL # OpenGL
if (CAN_USE_OPENGL) if (CAN_USE_OPENGL)
set (USE_OPENGL ON CACHE BOOL "${USE_OPENGL_DESCR}")
if (USE_OPENGL) if (USE_OPENGL)
add_definitions (-DHAVE_OPENGL_EXT) add_definitions (-DHAVE_OPENGL_EXT)
else()
list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGl)
list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGlTest)
endif() endif()
else() else()
OCCT_CHECK_AND_UNSET ("USE_OPENGL") OCCT_CHECK_AND_UNSET ("USE_OPENGL")
@ -628,12 +621,6 @@ endif()
# OpenGL ES 2.0 # OpenGL ES 2.0
if (CAN_USE_GLES2) if (CAN_USE_GLES2)
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
set (USE_GLES2 ON)
else()
set (USE_GLES2 OFF CACHE BOOL "${USE_GLES2_DESCR}")
endif()
if (USE_GLES2) if (USE_GLES2)
add_definitions (-DHAVE_GLES2_EXT) add_definitions (-DHAVE_GLES2_EXT)
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/egl") OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/egl")
@ -643,6 +630,8 @@ if (CAN_USE_GLES2)
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GLES2") OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GLES2")
OCCT_CHECK_AND_UNSET ("INSTALL_EGL") OCCT_CHECK_AND_UNSET ("INSTALL_EGL")
OCCT_CHECK_AND_UNSET ("INSTALL_GLES2") OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGles)
list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGlesTest)
endif() endif()
else() else()
OCCT_CHECK_AND_UNSET ("USE_GLES2") OCCT_CHECK_AND_UNSET ("USE_GLES2")
@ -653,6 +642,17 @@ else()
OCCT_CHECK_AND_UNSET ("INSTALL_GLES2") OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
endif() endif()
# D3D
if (USE_D3D)
add_definitions (-DHAVE_D3D)
#if(MSVC_VERSION LESS 1700)
#OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/d3d")
#endif()
else()
list (REMOVE_ITEM BUILD_TOOLKITS TKD3DHost)
list (REMOVE_ITEM BUILD_TOOLKITS TKD3DHostTest)
endif()
# TBB # TBB
if (NOT DEFINED ANDROID AND CAN_USE_TBB) if (NOT DEFINED ANDROID AND CAN_USE_TBB)
set (USE_TBB OFF CACHE BOOL "${USE_TBB_DESCR}") set (USE_TBB OFF CACHE BOOL "${USE_TBB_DESCR}")