add ZLIB to CMAKE target_link_libraries() as discussed in issue ampas…

…#134
michaeldsmith · Jul 2, 2024 · c4c51ec · c4c51ec
1 parent 70eccfb
commit c4c51ec
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,6 +44,17 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
+# ZLIB is automatically added by OpenEXR 3.x but needs to be added for OpenEXR 2.x
+find_package(ZLIB)
+if(TARGET ZLIB::ZLIB)
+	message( STATUS "found ZLIB" )
+	message( STATUS "	ZLIB_VERSION : ${ZLIB_VERSION}" )
+	message( STATUS "	ZLIB_INCLUDE_DIRS : ${ZLIB_INCLUDE_DIRS}" )
+	message( STATUS "	ZLIB_LIBRARIES : ${ZLIB_LIBRARIES}" )
+	message( STATUS "	ZLIB_INCLUDE_DIR : ${ZLIB_INCLUDE_DIR}" )
+	message( STATUS "	ZLIB_LIBRARY : ${ZLIB_LIBRARY}" )
+endif()
+
 find_package(OpenEXR 3 CONFIG QUIET)
 if(OpenEXR_FOUND)
   message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")

diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
@@ -33,6 +33,8 @@ target_link_libraries (exr_ctl_exr
           $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
           $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
           $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
+        # ZLIB for OpenEXR 2.x:
+	  	    $<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
     )
 #target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
 #target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )

diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt
@@ -33,6 +33,8 @@ target_link_libraries (exrdpx
           $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
           $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
           $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
+        # ZLIB for OpenEXR 2.x:
+	  	    $<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
     )
 #target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
 #target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )

diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt
@@ -30,6 +30,8 @@ target_link_libraries(ctlrender
 		$<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
 		$<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
 		$<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
+	  # ZLIB for OpenEXR 2.x:
+	  	$<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
 )
 
 if( OpenEXR_FOUND )

diff --git a/unittest/IlmImfCtl/CMakeLists.txt b/unittest/IlmImfCtl/CMakeLists.txt
@@ -28,6 +28,8 @@ target_link_libraries( IlmImfCtlTest
       $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
       $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
       $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
+    # ZLIB for OpenEXR 2.x:
+      $<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>
 )
 
 add_test( IlmImfCtl IlmImfCtlTest )