Commit 00a2d44f authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot
Browse files

Merge topic 'fix_compile_tools'

17da8720

 fix up how the compile tools are build for android ios
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci's avatarBerk Geveci <berk.geveci@kitware.com>
Merge-request: !1178
parents a62bf2ba 17da8720
Pipeline #6209 canceled with stage
......@@ -77,11 +77,10 @@ macro(compile_vtk_tools)
-DCMAKE_BUILD_TYPE:STRING=Release
-DVTK_BUILD_ALL_MODULES:BOOL=OFF
-DVTK_Group_Rendering:BOOL=OFF
-DVTK_Group_StandAlone:BOOL=OFF
-DVTK_Group_StandAlone:BOOL=ON
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_EXAMPLES:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DModule_vtkUtilitiesEncodeString:BOOL=ON
)
endmacro()
compile_vtk_tools()
......
......@@ -60,11 +60,10 @@ macro(compile_vtk_tools)
-DCMAKE_BUILD_TYPE:STRING=Release
-DVTK_BUILD_ALL_MODULES:BOOL=OFF
-DVTK_Group_Rendering:BOOL=OFF
-DVTK_Group_StandAlone:BOOL=OFF
-DVTK_Group_StandAlone:BOOL=ON
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_EXAMPLES:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DModule_vtkUtilitiesEncodeString:BOOL=ON
)
endmacro()
compile_vtk_tools()
......@@ -83,6 +82,7 @@ mark_as_advanced(
# expose some module options
option(Module_vtkRenderingOpenGL2 "Include Polygonal Rendering Support" ON)
option(Module_vtkInteractionWidgets "Include INteractionWidgets module" OFF)
# add volume rendering option for ES 3.0
if (OPENGL_ES_VERSION STREQUAL "3.0" AND Module_vtkRenderingOpenGL2)
......@@ -117,8 +117,9 @@ set(ios_cmake_flags
# -DModule_vtkImagingCore:BOOL=ON
# -DModule_vtkInteractionStyle:BOOL=ON
# -DModule_vtkParallelCore:BOOL=ON
-DModule_vtkRenderingFreeType:BOOL=OFF
# -DModule_vtkRenderingFreeType:BOOL=OFF
-DModule_vtkRenderingOpenGL2:BOOL=${Module_vtkRenderingOpenGL2}
-DModule_vtkInteractionWidgets:BOOL=${Module_vtkInteractionWidgets}
)
if (Module_vtkRenderingOpenGL2)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment