diff -urN opencascade-6.8.0.orig/adm/cmake/occt_inc_toolkits.cmake opencascade-6.8.0/adm/cmake/occt_inc_toolkits.cmake --- opencascade-6.8.0.orig/adm/cmake/occt_inc_toolkits.cmake 2014-11-07 16:28:09.000000000 +0100 +++ opencascade-6.8.0/adm/cmake/occt_inc_toolkits.cmake 2014-12-11 09:20:38.000000000 +0100 @@ -123,10 +123,12 @@ ELSE() LIST(APPEND UNSUBDIRS "adm/cmake/TKVoxel") ENDIF() -IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKIVtk") - add_subdirectory(${TK_ROOT_DIR}/adm/cmake/TKIVtk) -ELSE() - LIST(APPEND UNSUBDIRS "adm/cmake/TKIVtk") +IF (USE_VTK) + IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKIVtk") + add_subdirectory(${TK_ROOT_DIR}/adm/cmake/TKIVtk) + ELSE() + LIST(APPEND UNSUBDIRS "adm/cmake/TKIVtk") + ENDIF() ENDIF() IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/PTKernel") add_subdirectory(${TK_ROOT_DIR}/adm/cmake/PTKernel) @@ -328,10 +330,12 @@ ELSE() LIST(APPEND UNSUBDIRS "adm/cmake/TKQADraw") ENDIF() -IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKIVtkDraw") - add_subdirectory(${TK_ROOT_DIR}/adm/cmake/TKIVtkDraw) -ELSE() - LIST(APPEND UNSUBDIRS "adm/cmake/TKIVtkDraw") +IF (USE_VTK) + IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKIVtkDraw") + add_subdirectory(${TK_ROOT_DIR}/adm/cmake/TKIVtkDraw) + ELSE() + LIST(APPEND UNSUBDIRS "adm/cmake/TKIVtkDraw") + ENDIF() ENDIF() IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/DRAWEXE") add_subdirectory(${TK_ROOT_DIR}/adm/cmake/DRAWEXE) diff -urN opencascade-6.8.0.orig/adm/cmake/occt_toolkits.cmake opencascade-6.8.0/adm/cmake/occt_toolkits.cmake --- opencascade-6.8.0.orig/adm/cmake/occt_toolkits.cmake 2014-11-07 16:28:09.000000000 +0100 +++ opencascade-6.8.0/adm/cmake/occt_toolkits.cmake 2014-12-11 09:20:38.000000000 +0100 @@ -175,10 +175,12 @@ foreach( TK ${TKVoxel_DEPS}) LIST(APPEND USED_TOOLKITS ${TK} ) endforeach() - LIST(APPEND USED_TOOLKITS TKIVtk ) - foreach( TK ${TKIVtk_DEPS}) - LIST(APPEND USED_TOOLKITS ${TK} ) - endforeach() + if (USE_VTK) + LIST(APPEND USED_TOOLKITS TKIVtk ) + foreach( TK ${TKIVtk_DEPS}) + LIST(APPEND USED_TOOLKITS ${TK} ) + endforeach() + endif() endif() if (BUILD_ApplicationFramework) @@ -348,10 +350,12 @@ foreach( TK ${TKQADraw_DEPS}) LIST(APPEND USED_TOOLKITS ${TK} ) endforeach() - LIST(APPEND USED_TOOLKITS TKIVtkDraw ) - foreach( TK ${TKIVtkDraw_DEPS}) - LIST(APPEND USED_TOOLKITS ${TK} ) - endforeach() + if (USE_VTK) + LIST(APPEND USED_TOOLKITS TKIVtkDraw ) + foreach( TK ${TKIVtkDraw_DEPS}) + LIST(APPEND USED_TOOLKITS ${TK} ) + endforeach() + endif() LIST(APPEND USED_TOOLKITS DRAWEXE ) foreach( TK ${DRAWEXE_DEPS}) LIST(APPEND USED_TOOLKITS ${TK} )