From 45fe4fa4f205a2cb3472ddcf842578c3159c0f2b Mon Sep 17 00:00:00 2001 From: "T.J. Corona" Date: Mon, 25 Sep 2017 19:35:46 -0500 Subject: [PATCH] Add SMTK as a dependency The Simulation Model Toolkit (SMTK) is an open-source, multi-platform toolkit for supporting simulation workflows by providing access to different modeling kernels, mesh databases, and simulation infomation (via its attribute system). In order to build SMTK, the following packages have been updated: * boost * cmake --- examples/proteus.darwin.yaml | 1 + pkgs/boost/boost.yaml | 4 ++-- pkgs/cmake.yaml | 4 ++-- pkgs/smtk.yaml | 13 ++++--------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/examples/proteus.darwin.yaml b/examples/proteus.darwin.yaml index 43646f429..6db984bef 100644 --- a/examples/proteus.darwin.yaml +++ b/examples/proteus.darwin.yaml @@ -73,6 +73,7 @@ packages: netcdf4: netcdf4cpp: python-netcdf4: + smtk: h5py: ode: openblas: diff --git a/pkgs/boost/boost.yaml b/pkgs/boost/boost.yaml index 42ffa94ca..e386a47fe 100644 --- a/pkgs/boost/boost.yaml +++ b/pkgs/boost/boost.yaml @@ -7,8 +7,8 @@ dependencies: build: [bzip2, mpi, zlib, {{build_with}}] sources: -- key: tar.bz2:nbvp774ytlberd3zvf5zi6ppxhzkxlqd - url: http://downloads.sourceforge.net/boost/boost_1_60_0.tar.bz2 +- key: tar.bz2:tad2lulfm3cx7v2pwurhmtqlcnfixptl + url: http://downloads.sourceforge.net/boost/boost_1_65_1.tar.bz2 build_stages: - name: bootstrap diff --git a/pkgs/cmake.yaml b/pkgs/cmake.yaml index 40af41b73..9ce00816a 100644 --- a/pkgs/cmake.yaml +++ b/pkgs/cmake.yaml @@ -4,8 +4,8 @@ dependencies: build: [zlib, bzip2, curl, openssl, libidn, expat, ncurses] sources: -- key: tar.gz:zzozcyjznydfagya4uutg6brkcuhymyi - url: https://cmake.org/files/v3.8/cmake-3.8.1.tar.gz +- key: tar.gz:r2xxlypjgikzvluyvnphjekjsvcvks7g + url: https://cmake.org/files/v3.9/cmake-3.9.3.tar.gz build_stages: - when: platform == 'Darwin' diff --git a/pkgs/smtk.yaml b/pkgs/smtk.yaml index 8b53bc060..3c3decda8 100644 --- a/pkgs/smtk.yaml +++ b/pkgs/smtk.yaml @@ -1,22 +1,18 @@ extends: [cmake_package] dependencies: - build: [boost, gdal, hdf5, netcdf4, mpi, python, remus, vtk, zmq] + build: [boost, hdf5, netcdf4, python, remus, zmq] sources: -- url: https://gitlab.kitware.com/tjcorona/smtk.git - key: git:9c18b1d7207d17995ce260e095e7a5e9ae5f63cb +- url: https://gitlab.kitware.com/cmb/smtk.git + key: git:2c34aace226d5d2d0215f16e9cb043b49d00d7f0 defaults: relocatable: true build_stages: - name: configure - extra: ['-D SMTK_ENABLE_VTK_SUPPORT:BOOL=ON', - '-D SMTK_ENABLE_DISCRETE_SESSION:BOOL=ON', - '-D SMTK_ENABLE_EXODUS_SESSION:BOOL=ON', + extra: ['-D SMTK_ENABLE_VTK_SUPPORT:BOOL=OFF', '-D SMTK_ENABLE_MESH_SESSION:BOOL=ON', - '-D SMTK_ENABLE_POLYGON_SESSION:BOOL=ON', - '-D SMTK_ENABLE_REMOTE_SESSION:BOOL=ON', '-D SMTK_ENABLE_REMUS_SUPPORT:BOOL=ON', '-D SMTK_ENABLE_PYTHON_WRAPPING:BOOL=ON', '-D SMTK_USE_PYBIND11:BOOL=ON', @@ -24,7 +20,6 @@ build_stages: '-D ENABLE_HDF5:BOOL=ON', '-D ENABLE_NETCDF:BOOL=ON', '-D NETCDF_ROOT:STRING=${NETCDF4_DIR}', - '-D VTK_DIR:STRING=${VTK_DIR}', '-D PYTHON_LIBRARY:FILEPATH=${PYTHON_DIR}/lib/libpython2.7.dylib', '-D PYTHON_EXECUTABLE:FILEPATH=${PYTHON_DIR}/bin/python2.7', '-D PYTHON_INCLUDE_DIR:PATH=${PYTHON_DIR}/include/python2.7',