Commit 2bcecbd5 authored by John Tourtellott's avatar John Tourtellott Committed by Kitware Robot

Merge topic 'add-project-manager'

035c7260 Pass cumulus flag and testing options to cmb and smtk
39167b38 Fixes location for standalone plugins
c6ac1863 Add project manager plugin
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !479
parents 0334ea53 035c7260
......@@ -125,6 +125,7 @@ function (superbuild_find_projects var)
if (NOT DEVELOPER_MODE_smtk)
list(APPEND projects
smtkprojectmanager
smtkresourcemanagerstate)
endif ()
# For now it's a convenient option to control smtk documentation
......
......@@ -106,9 +106,13 @@ set(cmb_plugins_cmb
cmbPostProcessingModePlugin
)
set(cmb_plugins_standalone
smtkReadWriteResourceManagerStatePlugin
)
set(cmb_plugins_standalone)
if (smtkprojectmanager_enabled)
list(APPEND cmb_plugins_standalone smtkProjectManagerPlugin)
endif()
if (smtkresourcemanagerstate_enabled)
list(APPEND cmb_plugins_standalone smtkReadWriteResourceManagerStatePlugin)
endif()
if (cumulus_enabled)
set(cmb_plugins_paraview
......
......@@ -37,6 +37,9 @@ superbuild_add_project(cmb
cxx11 gdal hdf5 netcdf opencv
CMAKE_ARGS
${cmb_extra_cmake_args}
-DBUILD_TESTING:BOOL=${BUILD_TESTING}
-Dcmb_enable_testing:BOOL=${TEST_cmb}
-DKML_DIR:PATH=<INSTALL_DIR>
-DGDAL_DIR:PATH=<INSTALL_DIR>
-DCMB_TEST_DATA_ROOT:PATH=${CMB_TEST_DATA_ROOT}
......@@ -49,6 +52,11 @@ superbuild_add_project(cmb
# platforms.
-DMACOSX_APP_INSTALL_PREFIX:PATH=<INSTALL_DIR>/Applications
-DSMTK_ENABLE_TESTING:BOOL=${Test_SMTK}
# Pass Cumulus flag to smtk
-DSMTK_ENABLE_CUMULUS_SUPPORT:BOOL=${cumulus_enabled}
-DCMB_SUPERBUILD_DEVELOPER_ROOT:PATH=<INSTALL_DIR>
# Set CMAKE_INSTALL_LIBDIR to "lib" for all projects in the superbuild to
......
......@@ -5,7 +5,7 @@ set(cmb_package_name "modelbuilder")
set(cmb_programs_to_install
modelbuilder
TemplateEditor)
)
set(cmb_install_paraview_server FALSE)
set(cmb_install_paraview_python TRUE)
......
......@@ -54,6 +54,8 @@ superbuild_add_project(smtk
CMAKE_ARGS
${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=${BUILD_TESTING}
-DSMTK_ENABLE_TESTING:BOOL=${TEST_smtk}
-DSMTK_BUILD_DOCUMENTATION:STRING=${enable_smtk_doc}
-DSMTK_ENABLE_OPENCV:BOOL=${opencv_enabled}
-DSMTK_ENABLE_QT_SUPPORT:BOOL=${qt_enabled}
......
set(extra_cmake_args)
if (UNIX AND NOT APPLE)
list(APPEND extra_cmake_args
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=FALSE)
endif ()
set(response_file)
if (WIN32)
# Force response file usage. The command line gets way too long on Windows
# without this. Once VTK_USE_FILE and PARAVIEW_USE_FILE are gone, this can be
# removed again.
set(response_file -DCMAKE_NINJA_FORCE_RESPONSE_FILE:BOOL=ON)
endif ()
superbuild_add_project(smtkprojectmanager
DEBUGGABLE
DEFAULT_ON
DEPENDS boost cxx11 paraview qt qt5 smtk
CMAKE_ARGS
${extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
${response_file})
......@@ -39,10 +39,10 @@ endif()
foreach (plugin IN LISTS plugins)
superbuild_unix_install_plugin("lib${plugin}.so"
"lib/cmb-${cmb_version}"
"lib"
"lib;lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}"
LOCATION "lib/cmb-${cmb_version}/plugins/${plugin}/"
LOCATION "lib/plugins"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes})
endforeach ()
......
......@@ -151,3 +151,7 @@ superbuild_set_revision(nlohmannjson
superbuild_set_revision(smtkresourcemanagerstate
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/plugins/read-and-write-resource-manager-state.git"
GIT_TAG ff5aa02621c0c011d72e4bdc8c4f85c250a88f0f)
superbuild_set_revision(smtkprojectmanager
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/plugins/project-manager.git"
GIT_TAG master)
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