Skip to content

Commit b30c769

Browse files
michaeldsmithmichaeldsmith
authored
add ZLIB to CMakeLists.txt target_link_libraries() (#162)
* add ZLIB to CMAKE target_link_libraries() as discussed in issue #134 * add debugging message for ZLIB in CMAKE * add mac openexr2 static and docker openexr2 static to github workflow
1 parent fef45f2 commit b30c769

File tree

8 files changed

+260
-0
lines changed

8 files changed

+260
-0
lines changed

‎.github/workflows/docker_linuxes.yml

+10
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,13 @@ jobs:
201201

202202
- name: Run unit tests (ctest) within the Docker image
203203
run: docker run ctl:latest sh -c "cd ./build && ctest"
204+
205+
ubuntu-openexr2-static:
206+
runs-on: ubuntu-latest
207+
steps:
208+
- uses: actions/checkout@v4
209+
- name: Build the Docker image
210+
run: docker build --no-cache --rm -f ./docker/Dockerfile_ubuntu_22.04_openexr2_static -t ctl:latest .
211+
212+
- name: Run unit tests (ctest) within the Docker image
213+
run: docker run ctl:latest sh -c "cd ./build && ctest"

‎.github/workflows/mac_release_static.yml

+184
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
name: macOS-Release-shared
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'README.md'
7+
- 'doc/**'
8+
pull_request:
9+
paths-ignore:
10+
- 'README.md'
11+
- 'doc/**'
12+
13+
env:
14+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
15+
BUILD_TYPE: Release
16+
17+
jobs:
18+
19+
build-openexr2:
20+
21+
runs-on: macos-latest
22+
23+
steps:
24+
25+
# - name: uninstall openexr
26+
# run: brew uninstall --ignore-dependencies openexr
27+
28+
# - name: uninstall imath
29+
# run: brew uninstall --ignore-dependencies imath
30+
31+
- name: install dependencies - openexr v2.5
32+
run: |
33+
cd ..
34+
git clone https://github.com/AcademySoftwareFoundation/openexr.git &&
35+
cd openexr &&
36+
git checkout RB-2.5 &&
37+
mkdir build &&
38+
cd build &&
39+
cmake -DBUILD_SHARED_LIBS=OFF .. &&
40+
make &&
41+
sudo make install
42+
43+
- uses: actions/checkout@v4
44+
45+
- name: Configure CMake
46+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
47+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
48+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS=OFF
49+
50+
- name: Build
51+
# Build your program with the given configuration
52+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
53+
54+
build-openexr3:
55+
runs-on: macos-latest
56+
57+
steps:
58+
59+
- name: install dependencies - imath
60+
run: |
61+
cd ..
62+
git clone https://github.com/AcademySoftwareFoundation/Imath.git &&
63+
cd Imath &&
64+
mkdir build &&
65+
cd build &&
66+
cmake -DBUILD_SHARED_LIBS=OFF .. &&
67+
make &&
68+
sudo make install
69+
70+
- name: install dependencies - openexr v3.1
71+
run: |
72+
cd ..
73+
git clone https://github.com/AcademySoftwareFoundation/openexr.git &&
74+
cd openexr &&
75+
git checkout RB-3.1 &&
76+
mkdir build &&
77+
cd build &&
78+
cmake -DBUILD_SHARED_LIBS=OFF .. &&
79+
make &&
80+
sudo make install
81+
82+
- uses: actions/checkout@v4
83+
84+
- name: Configure CMake
85+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
86+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
87+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS=OFF
88+
89+
- name: Build
90+
# Build your program with the given configuration
91+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
92+
93+
test-openexr2:
94+
95+
runs-on: macos-latest
96+
97+
steps:
98+
99+
# - name: uninstall openexr
100+
# run: brew uninstall --ignore-dependencies openexr
101+
102+
# - name: uninstall imath
103+
# run: brew uninstall --ignore-dependencies imath
104+
105+
- name: install dependencies - openexr v2.5
106+
run: |
107+
cd ..
108+
git clone https://github.com/AcademySoftwareFoundation/openexr.git &&
109+
cd openexr &&
110+
git checkout RB-2.5 &&
111+
mkdir build &&
112+
cd build &&
113+
cmake -DBUILD_SHARED_LIBS=OFF .. &&
114+
make &&
115+
sudo make install
116+
117+
- uses: actions/checkout@v4
118+
119+
- name: Configure CMake
120+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
121+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
122+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS=OFF
123+
124+
- name: Build
125+
# Build your program with the given configuration
126+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
127+
128+
- name: Install
129+
run: sudo cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
130+
131+
- name: Test
132+
working-directory: ${{github.workspace}}/build
133+
# Execute tests defined by the CMake configuration.
134+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
135+
run: ctest -V --output-on-failure
136+
137+
test-openexr3:
138+
runs-on: macos-latest
139+
140+
steps:
141+
142+
- name: install dependencies - imath
143+
run: |
144+
cd ..
145+
git clone https://github.com/AcademySoftwareFoundation/Imath.git &&
146+
cd Imath &&
147+
mkdir build &&
148+
cd build &&
149+
cmake -DBUILD_SHARED_LIBS=OFF .. &&
150+
make &&
151+
sudo make install
152+
153+
- name: install dependencies - openexr v3.1
154+
run: |
155+
cd ..
156+
git clone https://github.com/AcademySoftwareFoundation/openexr.git &&
157+
cd openexr &&
158+
git checkout RB-3.1 &&
159+
mkdir build &&
160+
cd build &&
161+
cmake -DBUILD_SHARED_LIBS=OFF .. &&
162+
make &&
163+
sudo make install
164+
165+
- uses: actions/checkout@v4
166+
167+
- name: Configure CMake
168+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
169+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
170+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS=OFF
171+
172+
- name: Build
173+
# Build your program with the given configuration
174+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
175+
176+
- name: Install
177+
run: sudo cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
178+
179+
- name: Test
180+
working-directory: ${{github.workspace}}/build
181+
# Execute tests defined by the CMake configuration.
182+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
183+
run: ctest -V --output-on-failure
184+

‎CMakeLists.txt

+14
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,20 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
4444
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
4545
endif()
4646

47+
# ZLIB is automatically added by OpenEXR 3.x but needs to be added for OpenEXR 2.x
48+
find_package(ZLIB)
49+
if(TARGET ZLIB::ZLIB)
50+
message( STATUS "found ZLIB" )
51+
message( STATUS " ZLIB_VERSION : ${ZLIB_VERSION}" )
52+
message( STATUS " ZLIB_INCLUDE_DIRS : ${ZLIB_INCLUDE_DIRS}" )
53+
message( STATUS " ZLIB_LIBRARIES : ${ZLIB_LIBRARIES}" )
54+
message( STATUS " ZLIB_INCLUDE_DIR : ${ZLIB_INCLUDE_DIR}" )
55+
message( STATUS " ZLIB_LIBRARY : ${ZLIB_LIBRARY}" )
56+
else()
57+
message( STATUS "ZLIB was not found")
58+
message( STAUTS " ZLIB is automatically linked when using OpenEXR 3.x but CTL needs to link to ZLIB if using OpenEXR 2.x" )
59+
endif()
60+
4761
find_package(OpenEXR 3 CONFIG QUIET)
4862
if(OpenEXR_FOUND)
4963
message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")

‎OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ target_link_libraries (exr_ctl_exr
3333
$<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
3434
$<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
3535
$<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
36+
# ZLIB for OpenEXR 2.x:
37+
$<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
3638
)
3739
#target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
3840
#target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )

‎OpenEXR_CTL/exrdpx/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ target_link_libraries (exrdpx
3333
$<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
3434
$<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
3535
$<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
36+
# ZLIB for OpenEXR 2.x:
37+
$<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
3638
)
3739
#target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
3840
#target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )

‎ctlrender/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ target_link_libraries(ctlrender
3030
$<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
3131
$<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
3232
$<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
33+
# ZLIB for OpenEXR 2.x:
34+
$<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
3335
)
3436

3537
if( OpenEXR_FOUND )

‎docker/Dockerfile_ubuntu_22.04_openexr2_static

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM ubuntu:22.04
2+
3+
RUN apt-get update
4+
5+
# disable interactive install
6+
ENV DEBIAN_FRONTEND noninteractive
7+
8+
# install developement tools
9+
RUN apt-get -y install cmake
10+
RUN apt-get -y install g++
11+
RUN apt-get -y install git
12+
13+
# install CTL dependencies
14+
#RUN apt-get -y install libopenexr-dev
15+
#RUN apt-get -y install libtiff-dev
16+
17+
# install CTL dependencies - zlib
18+
RUN apt-get -y install zlib1g-dev
19+
20+
# install CTL dependecies - openexr
21+
WORKDIR /usr/src/
22+
RUN git clone https://github.com/AcademySoftwareFoundation/openexr.git
23+
WORKDIR /usr/src/openexr
24+
RUN git checkout RB-2.5
25+
WORKDIR /usr/src/openexr/build
26+
RUN cmake .. -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DOPENEXR_BUILD_TOOLS=OFF -DOPENEXR_INSTALL_EXAMPLES=OFF
27+
RUN make
28+
RUN make install
29+
30+
# build CTL
31+
WORKDIR /usr/src/CTL
32+
COPY . .
33+
WORKDIR /usr/src/CTL/build
34+
RUN rm -R * || true
35+
RUN cmake -DBUILD_SHARED_LIBS=OFF ..
36+
RUN make
37+
RUN make install
38+
39+
# add /usr/local/lib to the LD_LIBRARY_PATH
40+
# ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
41+
42+
# finalize docker environment
43+
WORKDIR /usr/src/CTL
44+

‎unittest/IlmImfCtl/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ target_link_libraries( IlmImfCtlTest
2828
$<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
2929
$<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
3030
$<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
31+
# ZLIB for OpenEXR 2.x:
32+
$<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
3133
)
3234

3335
add_test( IlmImfCtl IlmImfCtlTest )

0 commit comments

Comments
 (0)