Commit c0a46191 authored by John Tourtellott's avatar John Tourtellott

Add optional cumulus project

Also remove redundant items in versions.cmake file
parent ad0e07d6
......@@ -22,6 +22,7 @@ function (superbuild_find_projects var)
cgm
cmb
cmbworkflows
cumulus
cxx11
freetype
ftgl
......
......@@ -16,7 +16,7 @@ superbuild_add_project(cmb
DEPENDS boost remus vxl kml gdal qt4 python paraview shiboken
cmbworkflows zeromq opencv
smtk # XXX(smtk): until the submodule works properly
DEPENDS_OPTIONAL moab smtk ${cmb_extra_optional_dependencies}
DEPENDS_OPTIONAL moab smtk cumulus ${cmb_extra_optional_dependencies}
cxx11
CMAKE_ARGS
${extra_cmake_args}
......@@ -44,6 +44,9 @@ superbuild_add_project(cmb
-DUSE_SYSTEM_SMTK:BOOL=${smtk_enabled}
-DENABLE_HDF5:BOOL=${hdf5_enabled}
# Cumulus bits
-DENABLE_Cumulus:BOOL=${cumulus_enabled}
-DCMB_SUPERBUILD_DEVELOPER_ROOT:PATH=<INSTALL_DIR>
-DCMAKE_INSTALL_LIBDIR:STRING=${cmb_smtk_libdir})
......
superbuild_add_dummy_project(cumulus
DEPENDS pythongirderclient pythonrequests pythonsetuptools pythonsix
)
......@@ -19,7 +19,7 @@ superbuild_add_project(smtk
DEVELOPER_MODE
DEBUGGABLE
DEPENDS boost cxx11 qt4 shiboken paraview python remus hdf5 zeromq gdal
DEPENDS_OPTIONAL moab netcdf cgm
DEPENDS_OPTIONAL moab netcdf cgm cumulus
CMAKE_ARGS
${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON
......@@ -52,6 +52,9 @@ superbuild_add_project(smtk
# that we need to build
-DGDAL_DIR:PATH=<INSTALL_DIR>
# Cumulus bits
-DSMTK_ENABLE_CUMULUS_SUPPORT:BOOL=${cumulus_enabled}
-DSMTK_FIND_SHIBOKEN:STRING=)
if (WIN32)
......
......@@ -81,14 +81,6 @@ 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(pythonsix
URL "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz"
URL_MD5 34eed507548117b2ab523ab14b2f8b55)
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(pythonsetuptools
URL "https://pypi.python.org/packages/45/5e/79ca67a0d6f2f42bfdd9e467ef97398d6ad87ee2fa9c8cdf7caf3ddcab1e/setuptools-23.0.0.tar.gz"
URL_MD5 100a90664040f8ff232fbac02a4c5652)
......
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