Commit 1d0a83b3 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'unix-requests-install'

4226cba7 apple: search for plugins with ModelBuilder
952e724f superbuild: support installing Python on Linux
02b965fc python packages: require setuptools
94eae108

 pythonsetuptools: install our own setuptools
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !146
parents bc2b7d14 4226cba7
......@@ -36,6 +36,7 @@ function (superbuild_find_projects var)
python
pythongirderclient
pythonrequests
pythonsetuptools
pythonsix
qt4
remus
......
set(cmb_plugins)
foreach (cmb_plugin IN LISTS cmb_plugins_to_install)
if (EXISTS "${superbuild_install_location}/Applications/ModelBuilder.app/Contents/Libraries/lib${cmb_plugin}.dylib")
list(APPEND cmb_plugins
"${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
......
superbuild_add_project_python(pythongirderclient
DEPENDS pythonsix pythonrequests)
DEPENDS pythonsetuptools pythonsix pythonrequests)
superbuild_add_project_python(pythonrequests)
superbuild_add_project_python(pythonrequests
DEPENDS pythonsetuptools)
superbuild_add_project_python(pythonsetuptools)
superbuild_add_project_python(pythonsix)
superbuild_add_project_python(pythonsix
DEPENDS pythonsetuptools)
Subproject commit 9d9c5c30761607ce68f389986a4f3e11f852e0ba
Subproject commit e3e640096760e0a20f2b60d4bddd47decf861c9a
......@@ -78,8 +78,8 @@ superbuild_set_revision(pythonrequests
URL_MD5 0b7f480d19012ec52bab78292efd976d)
superbuild_set_revision(pythonsetuptools
URL "https://pypi.python.org/packages/source/s/setuptools/setuptools-20.3.1.tar.gz"
URL_MD5 7e4ba5cdebc02710d3ab748c103fc673)
URL "https://pypi.python.org/packages/45/5e/79ca67a0d6f2f42bfdd9e467ef97398d6ad87ee2fa9c8cdf7caf3ddcab1e/setuptools-23.0.0.tar.gz"
URL_MD5 100a90664040f8ff232fbac02a4c5652)
superbuild_set_revision(pythongirderclient
URL "https://pypi.python.org/packages/source/g/girder-client/girder-client-1.1.2.tar.gz"
......
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