Skip to content

Commit

Permalink
Issues/0086 (ampas#90)
Browse files Browse the repository at this point in the history
* use openexr v2.5, closes ampas#86
  • Loading branch information
michaeldsmith authored Aug 6, 2022
1 parent 9d69d3a commit 8e2bc23
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/cmake_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,22 @@ jobs:

steps:

- name: install dependencies
- name: install dependencies - valgrind
run: sudo apt-get -y install valgrind

- name: install dependencies - openexr/ilmbase v2.5
run: |
cd ..
sudo apt-get -y install zlib1g-dev &&
git clone https://github.com/AcademySoftwareFoundation/openexr.git &&
cd openexr &&
git checkout RB-2.5 &&
mkdir build &&
cd build &&
cmake .. &&
make &&
sudo make install
- uses: actions/checkout@v3

- name: Configure CMake
Expand Down
15 changes: 13 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,24 @@ ENV DEBIAN_FRONTEND noninteractive
# install developement tools
RUN apt-get -y install cmake
RUN apt-get -y install g++
RUN apt-get -y install git

# install developement debugging tools
RUN apt-get -y install valgrind

# install CTL dependencies
RUN apt-get -y install libilmbase-dev
RUN apt-get -y install libopenexr-dev
#RUN apt-get -y install libilmbase-dev
#RUN apt-get -y install libopenexr-dev
RUN apt-get -y install zlib1g-dev
WORKDIR /usr/src/
RUN git clone https://github.com/AcademySoftwareFoundation/openexr.git
WORKDIR /usr/src/openexr
RUN git checkout RB-2.5
WORKDIR /usr/src/openexr/build
RUN cmake ..
RUN make
RUN make install

RUN apt-get -y install libtiff-dev

# build CTL
Expand Down
2 changes: 1 addition & 1 deletion resources/test/scripts/run_valgrind.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

set -x
set -u
set -u

# get initial path before changing it
SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
Expand Down

0 comments on commit 8e2bc23

Please # to comment.