Commit f4b50b2b authored by David Thompson's avatar David Thompson

Build/package. the new modelbuilder application.

parent e825a6dd
Pipeline #95845 passed with stage
set(cmb_plugins)
foreach (cmb_plugin IN LISTS cmb_plugins_all)
if (EXISTS "${superbuild_install_location}/Applications/ModelBuilder.app/Contents/Libraries/lib${cmb_plugin}.dylib")
if (EXISTS "${superbuild_install_location}/Applications/modelbuilder.app/Contents/Libraries/lib${cmb_plugin}.dylib")
list(APPEND cmb_plugins
${cmb_plugin})
set("cmb_plugin_path_${cmb_plugin}"
"${superbuild_install_location}/Applications/ModelBuilder.app/Contents/Libraries/lib${cmb_plugin}.dylib")
"${superbuild_install_location}/Applications/modelbuilder.app/Contents/Libraries/lib${cmb_plugin}.dylib")
continue ()
endif ()
......
include(modelbuilder.bundle.common)
set(cmb_package "ModelBuilder ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}")
set(cmb_package "modelbuilder ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}")
set(cmb_doc_base_dir "Contents/doc")
include(cmb.bundle.apple)
......@@ -57,6 +57,7 @@ set(cmb_plugins_smtk
smtkExodusSessionPlugin
smtkMeshSessionPlugin
smtkOpenCVPlugin
smtkPVServerExtPlugin
smtkPQOperatorViewsPlugin
smtkPolygonSessionPlugin
smtkRemoteSessionPlugin
......@@ -87,7 +88,7 @@ set(cmb_plugins_all
${cmb_plugins_smtk}
${cmb_plugins_cmb})
set(cmb_plugins_ModelBuilder
set(cmb_plugins_modelbuilder
#${cmb_plugins_cmb} # Autoloaded
${cmb_plugins_smtk})
set(cmb_plugins_paraview
......
......@@ -43,7 +43,7 @@ superbuild_add_project(cmb
-DPARAVIEW_QT_VERSION:STRING=${qt_version}
#specify semi-colon separated paths for session plugins
-DCMB_TEST_PLUGIN_PATHS:STRING=<INSTALL_DIR>/${cmb_test_plugin_dir}
-Dcmb_test_plugin_paths:STRING=<INSTALL_DIR>/${cmb_test_plugin_dir}
#specify what mesh workers we should build
-DBUILD_TRIANGLE_MESH_WORKER:BOOL=${triangle_enabled}
......
......@@ -4,12 +4,8 @@ set(CPACK_PACKAGE_NAME "CMB")
set(cmb_package_name "CMB-Hydro")
set(cmb_programs_to_install
#GeologyBuilder
GrabCuts
SceneBuilder
ModelBuilder
MeshViewer
PointsBuilder
modelbuilder
paraview
TemplateEditor)
......
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"CMB ModelBuilder Application")
"CMB modelbuilder application")
set(CPACK_PACKAGE_NAME "CMB")
set(cmb_package_name "ModelBuilder")
set(cmb_package_name "modelbuilder")
set(cmb_programs_to_install
ModelBuilder
modelbuilder
TemplateEditor)
set(cmb_install_paraview_server FALSE)
......
......@@ -116,7 +116,7 @@ elseif (smtk_SOURCE_SELECTION STREQUAL "source")
set(smtk_can_lfs TRUE)
endif ()
elseif (smtk_SOURCE_SELECTION STREQUAL "from_cmb")
if (EXISTS "${smtk_source_dir}/ThirdParty/SMTK/.git" OR
if (EXISTS "${smtk_source_dir}/thirdparty/smtk/.git" OR
cmb_SOURCE_SELECTION STREQUAL "git")
set(smtk_can_lfs TRUE)
endif ()
......
......@@ -6,7 +6,7 @@ set(CPACK_NSIS_HELP_LINK "https://gitlab.kitware.com/cmb/cmb/wikis/home")
#FIXME: need a pretty icon.
#set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_LIST_DIR}/paraview.ico")
set(ModelBuilder_description "Model Builder")
set(modelbuilder_description "Model Builder")
set(paraview_description "ParaView")
set(pvserver_description "ParaView (server)")
set(pvdataserver_description "ParaView (data server)")
......
......@@ -5,7 +5,7 @@ superbuild_set_revision(boost
# XXX: When updating this, update the version number in CMakeLists.txt as well.
# The current version of ParaView is master branch as of 18 Jan 2018.
set(paraview_revision "113854a765900971f174d2e1c45c859296a3704a")
set(paraview_revision "3125c77a9ec0e30a3d9dd63ed0de76197f473fdf")
#set(paraview_revision origin/master)
if (USE_PARAVIEW_master)
......@@ -56,7 +56,7 @@ superbuild_set_selectable_source(smtk
SELECT from_cmb DEFAULT
DOWNLOAD_COMMAND
"${CMAKE_COMMAND}" -E echo_append
SOURCE_DIR "${smtk_source_dir}/ThirdParty/SMTK"
SOURCE_DIR "${smtk_source_dir}/thirdparty/smtk"
SELECT source CUSTOMIZABLE
SOURCE_DIR "source-smtk")
......
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