Commit 19b85b7b authored by John Tourtellott's avatar John Tourtellott Committed by Kitware Robot

Merge topic 'add-slac-plugin'

820a4166 Add logic to check sha256 for new downloads
32875ff1 Update girder-client to version 2.4.0
0cfab4b4 Add SLACTools plugin to modelbuilder package
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !457
parents 4cd61afb 820a4166
......@@ -62,8 +62,10 @@ function (superbuild_find_projects var)
pyarc
pybind11
python
pythondiskcache
pythongirderclient
pythonrequests
pythonrequeststoolbelt
pythonsetuptools
pythonsix
qt
......
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")
list(APPEND cmb_plugins
${cmb_plugin})
set("cmb_plugin_path_${cmb_plugin}"
"${superbuild_install_location}/Applications/modelbuilder.app/Contents/Libraries/lib${cmb_plugin}.dylib")
continue ()
endif ()
foreach (path IN ITEMS "" "cmb-${cmb_version}" "paraview-${paraview_version}")
if (EXISTS "${superbuild_install_location}/lib/${path}/lib${cmb_plugin}.dylib")
list(APPEND cmb_plugins
${cmb_plugin})
set("cmb_plugin_path_${cmb_plugin}"
"${superbuild_install_location}/lib/${path}/lib${cmb_plugin}.dylib")
break ()
endif ()
endforeach ()
endforeach ()
foreach(program IN LISTS cmb_programs_to_install)
set(plugins "${cmb_plugins_${program}}")
set(plugins)
set(plugin_paths)
foreach (plugin IN LISTS plugins)
if (NOT DEFINED "cmb_plugin_path_${plugin}")
message(FATAL_ERROR "The application ${program} needs the ${plugin} plugin, but it was not found.")
endif ()
list(APPEND plugin_paths
"${cmb_plugin_path_${plugin}}")
endforeach ()
if (program STREQUAL "modelbuilder")
# Install CMB plugins in modelbuilder app
foreach(plugin IN LISTS cmb_plugins_cmb)
list(APPEND plugin_paths "${superbuild_install_location}/Applications/modelbuilder.app/Contents/Plugins/lib${plugin}.dylib")
endforeach()
list(APPEND plugins ${cmb_plugins_cmb})
# Install paraview plugins in modelbuilder app
foreach (plugin IN LISTS cmb_plugins_paraview)
list(APPEND plugin_paths "${superbuild_install_location}/Applications/paraview.app/Contents/Plugins/lib${plugin}.dylib")
endforeach()
list(APPEND plugins ${cmb_plugins_paraview})
endif()
superbuild_apple_create_app(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"${program}.app"
"${superbuild_install_location}/Applications/${program}.app/Contents/MacOS/${program}"
CLEAN
FAKE_PLUGIN_PATHS
PLUGINS ${plugin_paths}
SEARCH_DIRECTORIES
"${superbuild_install_location}/lib")
......
......@@ -32,7 +32,7 @@ list(REMOVE_DUPLICATES cmb_programs_to_install)
function (cmb_add_plugin output)
set(contents "<?xml version=\"1.0\"?>\n<Plugins>\n</Plugins>\n")
foreach (name IN LISTS ARGN)
set(plugin_directive " <Plugin name=\"${name}\" auto_load=\"1\" />\n")
set(plugin_directive " <Plugin name=\"${name}\" auto_load=\"0\" />\n")
string(REPLACE "</Plugins>" "${plugin_directive}</Plugins>" contents "${contents}")
endforeach ()
file(WRITE "${output}" "${contents}")
......@@ -106,14 +106,11 @@ set(cmb_plugins_cmb
cmbPostProcessingModePlugin
)
set(cmb_plugins_all
${cmb_plugins_smtk}
${cmb_plugins_cmb})
set(cmb_plugins_modelbuilder
#${cmb_plugins_cmb} # Autoloaded
${cmb_plugins_smtk})
set(cmb_plugins_paraview)
if (cumulus_enabled)
set(cmb_plugins_paraview
SLACTools
)
endif()
set(cmb_python_modules
smtk
......@@ -136,7 +133,9 @@ endif ()
if (pythongirderclient_enabled)
list(APPEND cmb_python_modules
diskcache
requests
requests_toolbelt
girder_client)
endif ()
......
superbuild_add_dummy_project(cumulus
DEPENDS pythongirderclient pythonrequests pythonsetuptools pythonsix
DEPENDS pythondiskcache pythongirderclient pythonrequests pythonrequeststoolbelt pythonsetuptools pythonsix
)
superbuild_add_project_python(pythondiskcache
DEPENDS pythonsetuptools)
superbuild_add_project_python(pythongirderclient
DEPENDS pythonsetuptools pythonsix pythonrequests)
DEPENDS pythondiskcache pythonrequests pythonrequeststoolbelt pythonsetuptools pythonsix)
superbuild_add_project_python(pythonrequeststoolbelt
DEPENDS pythonsetuptools)
......@@ -47,6 +47,28 @@ foreach (plugin IN LISTS plugins)
EXCLUDE_REGEXES ${exclude_regexes})
endforeach ()
foreach (plugin IN LISTS cmb_plugins_cmb)
superbuild_unix_install_plugin("lib${plugin}.so"
"lib"
"lib/${plugin}"
SEARCH_DIRECTORIES "${library_paths}"
LOCATION "lib/plugins"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes}
)
endforeach ()
foreach (plugin IN LISTS cmb_plugins_paraview)
superbuild_unix_install_plugin("lib${plugin}.so"
"lib"
"lib/paraview-${paraview_version}/plugins/${plugin}"
SEARCH_DIRECTORIES "${library_paths}"
LOCATION "lib/paraview-${paraview_version}/plugins/${plugin}/"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes}
)
endforeach ()
superbuild_unix_install_python(
LIBDIR "lib/cmb-${cmb_version}"
MODULES ${cmb_python_modules}
......
......@@ -73,6 +73,22 @@ if (plugins)
endforeach ()
endif()
foreach (plugin IN LISTS cmb_plugins_cmb)
set(plugin_library_paths ${library_paths})
list(APPEND plugin_library_paths "bin/${plugin}")
superbuild_windows_install_plugin("${plugin}.dll"
"bin"
"${plugin_library_paths}")
endforeach ()
foreach (plugin IN LISTS cmb_plugins_paraview)
set(plugin_library_paths ${library_paths})
list(APPEND plugin_library_paths "bin/plugins/${plugin}")
superbuild_windows_install_plugin("${plugin}.dll"
"bin"
"${plugin_library_paths}")
endforeach ()
superbuild_windows_install_python(
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES "${superbuild_install_location}/bin/Lib/site-packages"
......
superbuild_add_project_python(pythongirderclient
DEPENDS pythonsix pythonrequests pythonsetuptools)
DEPENDS pythondiskcache pythonrequests pythonrequeststoolbelt pythonsetuptools pythonsix)
......@@ -101,13 +101,24 @@ superbuild_set_revision(triangle
URL "https://www.paraview.org/files/dependencies/triangle-4c20820448cdfa27f968cfd7cb33ea5b9426ad91.tar.bz2"
URL_MD5 9a016bc90f1cdff441c75ceb53741b11)
superbuild_set_revision(pythondiskcache
URL "https://files.pythonhosted.org/packages/1b/18/ef9b2748bfadc2035d20076869db2dd5d4e22858dd819776bc8f488ec152/diskcache-3.1.0.tar.gz"
URL_HASH SHA256=96cd1be1240257167a090794cce45db02ecf39d20b7a062580299b42107690ac
)
superbuild_set_revision(pythongirderclient
URL "https://files.pythonhosted.org/packages/42/49/a8772bc89b348b0a41e2d583a6aa04d4d9db21a3568a7df17d68029ebb84/girder-client-2.4.0.tar.gz"
URL_HASH SHA256=1a9c882b8bce2e8233f572a4df9565c678e5614993e6606cdff04251532cddcb
)
superbuild_set_revision(pythonrequests
URL "https://pypi.python.org/packages/source/r/requests/requests-2.9.1.tar.gz"
URL_MD5 0b7f480d19012ec52bab78292efd976d)
superbuild_set_revision(pythongirderclient
URL "https://pypi.python.org/packages/source/g/girder-client/girder-client-1.1.2.tar.gz"
URL_MD5 4cd5e0cab41337a41f45453d25193dcf)
superbuild_set_revision(pythonrequeststoolbelt
URL "https://files.pythonhosted.org/packages/86/f9/e80fa23edca6c554f1994040064760c12b51daff54b55f9e379e899cd3d4/requests-toolbelt-0.8.0.tar.gz"
URL_HASH SHA256=f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5
)
superbuild_set_revision(pybind11
# https://github.com/pybind/pybind11.git
......
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