X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=adm%2Fcmake%2Focct_toolkit.cmake;h=80e6a75e822e354293902922882acab1df9a9e43;hp=57c9269c26a3613323de43ae413aff72e28f5f91;hb=4f26118e3b3292006a13d7177a5dd6319cf506cd;hpb=59e353b75d51e88ac30ed37307a59b95a50146f8 diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake index 57c9269..80e6a75 100644 --- a/adm/cmake/occt_toolkit.cmake +++ b/adm/cmake/occt_toolkit.cmake @@ -281,9 +281,19 @@ if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2") list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY}) if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL) list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2) + if(VTK_MAJOR_VERSION GREATER 6) + list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingGL2PSOpenGL2) + endif() endif() endif() endforeach() +else() + if(VTK_MAJOR_VERSION EQUAL 6 AND VTK_MINOR_VERSION GREATER 2 OR VTK_MAJOR_VERSION GREATER 6) + list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL" IS_VTK_RENDER_FREETYPE_FOUND) + if (NOT ${IS_VTK_RENDER_FREETYPE_FOUND} EQUAL -1) + list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL") + endif() + endif() endif() if (BUILD_SHARED_LIBS)