Skip to content

Commit 05607aa

Browse files
committed
fix ZERO_CHECK OpenEXR's deps timestamp issues, update libdeflate submodule
1 parent 337d13a commit 05607aa

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

3rdparty/CMakeLists.txt

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -193,42 +193,41 @@ option(PNG_TESTS "Build libpng tests" OFF)
193193
add_subdirectory(libpng libpng EXCLUDE_FROM_ALL)
194194
add_dependencies(png_static zlibstatic)
195195

196-
197196
# OpenEXR
198197
option(_NBL_COMPILE_WITH_OPEN_EXR_ "Build with OpenEXR library" ON)
199198

200199
# Imath
200+
set(IMATH_INSTALL OFF)
201201
add_subdirectory(imath EXCLUDE_FROM_ALL)
202202

203203
if(_NBL_COMPILE_WITH_OPEN_EXR_)
204204
# Deflate
205-
option(LIBDEFLATE_BUILD_SHARED_LIB "" OFF)
206-
option(LIBDEFLATE_BUILD_STATIC_LIB "" ON)
207-
option(LIBDEFLATE_GZIP_SUPPORT "" OFF)
208-
option(LIBDEFLATE_BUILD_GZIP "" OFF)
205+
set(LIBDEFLATE_BUILD_SHARED_LIB OFF)
206+
set(LIBDEFLATE_BUILD_STATIC_LIB ON)
207+
set(LIBDEFLATE_GZIP_SUPPORT OFF)
208+
set(LIBDEFLATE_BUILD_GZIP OFF)
209209
add_subdirectory(libdeflate EXCLUDE_FROM_ALL)
210210
set(libdeflate_DIR "${CMAKE_CURRENT_BINARY_DIR}/libdeflate")
211211

212212
# OpenEXR
213+
set(OPENEXR_FORCE_INTERNAL_DEFLATE ON) # trick it into thinking its internal
214+
set(EXR_DEFLATE_LIB libdeflate_static) # and pass deflate target directly from our build tree
215+
set(OPENEXR_FORCE_INTERNAL_IMATH ON) # similar case, force it to look into target from build tree
213216
set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
214217
set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
215218
set(_OLD_BUILD_TESTING ${BUILD_TESTING})
216219
set(BUILD_SHARED_LIBS OFF)
217220
set(BUILD_STATIC_LIBS OFF)
218221
set(BUILD_TESTING OFF)
219-
set(PYILMBASE_ENABLE OFF CACHE STRING "" FORCE)
220-
set(OPENEXR_BUILD_UTILS OFF CACHE STRING "" FORCE)
221-
set(OPENEXR_FORCE_INTERNAL_IMATH OFF CACHE STRING "" FORCE)
222-
set(OPENEXR_FORCE_INTERNAL_DEFLATE OFF CACHE STRING "" FORCE)
223-
set(OPENEXR_BUILD_TOOLS OFF CACHE STRING "" FORCE)
224-
set(OPENEXR_INSTALL OFF CACHE STRING "" FORCE)
225-
set(OPENEXR_INSTALL_DOCS OFF CACHE STRING "" FORCE)
226-
set(OPENEXR_INSTALL_EXAMPLES OFF CACHE STRING "" FORCE)
227-
set(OPENEXR_INSTALL_PKG_CONFIG OFF CACHE STRING "" FORCE)
228-
set(OPENEXR_INSTALL_TOOLS OFF CACHE STRING "" FORCE)
229-
222+
set(PYILMBASE_ENABLE OFF)
223+
set(OPENEXR_BUILD_UTILS OFF)
224+
set(OPENEXR_BUILD_TOOLS OFF)
225+
set(OPENEXR_INSTALL OFF)
226+
set(OPENEXR_INSTALL_DOCS OFF)
227+
set(OPENEXR_INSTALL_EXAMPLES OFF)
228+
set(OPENEXR_INSTALL_PKG_CONFIG OFF)
229+
set(OPENEXR_INSTALL_TOOLS OFF)
230230
add_subdirectory(openexr EXCLUDE_FROM_ALL)
231-
232231
set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
233232
set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
234233
set(BUILD_TESTING ${_OLD_BUILD_TESTING})

3rdparty/libdeflate

0 commit comments

Comments
 (0)