Commit e4a87aee authored by Haocheng LIU's avatar Haocheng LIU Committed by Kitware Robot

Merge topic 'add-disable-smtk-doc-flags' into release

0fcae1fb Add a superbuild level option to control smtk documentation build
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !473
parents 6726dfa7 0fcae1fb
Pipeline #132330 failed with stage
...@@ -115,10 +115,12 @@ function (superbuild_find_projects var) ...@@ -115,10 +115,12 @@ function (superbuild_find_projects var)
pywin32) pywin32)
endif () endif ()
if (NOT DEVELOPER_MODE_smtk) if (NOT DEVELOPER_MODE_smtk)
list(APPEND projects list(APPEND projects
smtkresourcemanagerstate) smtkresourcemanagerstate)
endif () endif ()
# For now it's a convenient option to control smtk documentation
option(ENABLE_DOCUMENTATION "Enable documentation" ON)
option(USE_NONFREE_COMPONENTS "Enable the non-free parts of the superbuild" OFF) option(USE_NONFREE_COMPONENTS "Enable the non-free parts of the superbuild" OFF)
mark_as_advanced(USE_NONFREE_COMPONENTS) mark_as_advanced(USE_NONFREE_COMPONENTS)
......
...@@ -20,6 +20,11 @@ if (vtkonly_enabled OR paraview_enabled) ...@@ -20,6 +20,11 @@ if (vtkonly_enabled OR paraview_enabled)
set(smtk_enable_vtk ON) set(smtk_enable_vtk ON)
endif () endif ()
set (enable_smtk_doc always)
if (NOT ENABLE_DOCUMENTATION)
set (enable_smtk_doc never)
endif()
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
list(APPEND smtk_extra_cmake_args list(APPEND smtk_extra_cmake_args
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=FALSE) -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=FALSE)
...@@ -49,7 +54,7 @@ superbuild_add_project(smtk ...@@ -49,7 +54,7 @@ superbuild_add_project(smtk
CMAKE_ARGS CMAKE_ARGS
${smtk_extra_cmake_args} ${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON
-DSMTK_BUILD_DOCUMENTATION:STRING=always -DSMTK_BUILD_DOCUMENTATION:STRING=${enable_smtk_doc}
-DSMTK_ENABLE_OPENCV:BOOL=${opencv_enabled} -DSMTK_ENABLE_OPENCV:BOOL=${opencv_enabled}
-DSMTK_ENABLE_QT_SUPPORT:BOOL=${qt_enabled} -DSMTK_ENABLE_QT_SUPPORT:BOOL=${qt_enabled}
-DSMTK_ENABLE_VTK_SUPPORT:BOOL=${smtk_enable_vtk} -DSMTK_ENABLE_VTK_SUPPORT:BOOL=${smtk_enable_vtk}
......
Markdown is supported
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