Skip to content

Commit

Permalink
Update cmake, vtk.
Browse files Browse the repository at this point in the history
  • Loading branch information
tjcorona committed May 10, 2017
1 parent dc71453 commit 6f41242
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
6 changes: 6 additions & 0 deletions examples/proteus.darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,9 @@ packages:
yaml:
pytest:
pytest-xdist:
boost:
toolset: darwin
remus:
gdal:
vtk:
smtk:
4 changes: 2 additions & 2 deletions pkgs/cmake.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dependencies:
build: [zlib, bzip2, curl, openssl, libidn, expat, ncurses]

sources:
- key: tar.gz:3j6mgtq44hmc4z5dfkyidqbmfbcvgtgy
url: https://cmake.org/files/v3.4/cmake-3.4.2.tar.gz
- key: tar.gz:zzozcyjznydfagya4uutg6brkcuhymyi
url: https://cmake.org/files/v3.8/cmake-3.8.1.tar.gz

build_stages:
- when: platform == 'Darwin'
Expand Down
10 changes: 1 addition & 9 deletions pkgs/vtk/vtk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sources:
url: http://www.vtk.org/files/release/7.1/VTK-7.1.0.tar.gz

defaults:
# lib/vtk-5.10/libvtkHybrid.so.5.10.1 contains hard-coded path
# lib/vtk-7.1/libvtkHybrid.so.7.1.0 contains hard-coded path
relocatable: false
vtk_use_tk: false

Expand All @@ -29,14 +29,6 @@ build_stages:
export PYTHONPATH=${ARTIFACT}/{{python_site_packages_rel}}:$PYTHONPATH
mkdir -p ${ARTIFACT}/{{python_site_packages_rel}}
- when: platform == 'Cygwin'
files: [vtk-5.10.1-cygwin.patch]
name: vtk_cygwin_patch
handler: bash
before: setup_builddir
bash: |
patch -p1 < _hashdist/vtk-5.10.1-cygwin.patch
- name: configure
extra:
- '-D BUILD_TESTING:BOOL=OFF'
Expand Down

0 comments on commit 6f41242

Please sign in to comment.