add OpenEXR target link libraries recommended by Openexr Porting Guid…

…e - https://openexr.com/en/latest/PortingGuide.html
ampas · Jun 30, 2024 · 5a87151 · 5a87151
1 parent 31093c1
commit 5a87151
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 41 deletions.
diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt
@@ -21,9 +21,15 @@ target_link_libraries(ctlrender
 		IlmCtl
 		ctldpx
 	    # For OpenEXR/Imath 3.x:
-          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
-        # For OpenEXR 2.4/2.5:
-          $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+		$<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+		$<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+		$<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
+	  # For OpenEXR 2.4/2.5:
+		$<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+		$<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
+		$<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
+		$<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
+		$<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
 )
 
 if( OpenEXR_FOUND )

diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt
@@ -26,22 +26,19 @@ target_include_directories(IlmCtl
 		${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-if( IlmBase_FOUND )
-	target_link_libraries (IlmCtl
+target_link_libraries (IlmCtl
     PRIVATE
+        # For OpenEXR/Imath 3.x:
+          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
         # For OpenEXR 2.4/2.5:
+          $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+          $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
           $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
           $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
           $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
     )
-else()
-	target_link_libraries (IlmCtl
-	PRIVATE
-	# For OpenEXR/Imath 3.x:
-	  $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
-	  $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
-	)
-endif()
 
 set_target_properties(IlmCtl
 	PROPERTIES

diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt
@@ -11,25 +11,21 @@ target_include_directories(IlmCtlMath
 		${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-if(IlmBase_FOUND)
-	target_link_libraries(IlmCtlMath
+target_link_libraries (IlmCtlMath
 	PUBLIC
 		IlmCtl
-	PUBLIC
-		# For OpenEXR 2.4/2.5:
-        $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
-        $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
-	)	
-else()
-	target_link_libraries(IlmCtlMath
-	PUBLIC
-		IlmCtl
-	PUBLIC
-		# For OpenEXR/Imath 3.x:
-        $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
-        $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
-	)
-endif()
+    PRIVATE
+        # For OpenEXR/Imath 3.x:
+          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
+        # For OpenEXR 2.4/2.5:
+          $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+          $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
+          $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
+          $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
+          $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
+    )
 
 set_target_properties(IlmCtlMath
 	PROPERTIES

diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt
@@ -73,6 +73,17 @@ target_link_libraries(IlmCtlSimd
 	PUBLIC
 		IlmCtlMath
 		IlmCtl
+	PRIVATE
+        # For OpenEXR/Imath 3.x:
+          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
+        # For OpenEXR 2.4/2.5:
+          $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+          $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
+          $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
+          $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
+          $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
 )
 
 set_target_properties(IlmCtlSimd

diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt
@@ -22,17 +22,17 @@ target_include_directories(IlmImfCtl
 target_link_libraries (IlmImfCtl
 	PUBLIC
 		IlmCtl
-  PUBLIC
-        # For OpenEXR/Imath 3.x:
-          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
-#          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
-          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
-        # For OpenEXR 2.4/2.5:
-          $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
- #         $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
-          $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
-          $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
-          $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
+  PRIVATE
+    # For OpenEXR/Imath 3.x:
+      $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+      $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+      $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
+    # For OpenEXR 2.4/2.5:
+      $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+      $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
+      $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
+      $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
+      $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
     )
 
 set_target_properties(IlmImfCtl

diff --git a/unittest/IlmCtl/CMakeLists.txt b/unittest/IlmCtl/CMakeLists.txt
@@ -20,6 +20,17 @@ target_link_libraries(IlmCtlTest
 	PRIVATE
 		IlmCtlSimd
 		IlmCtl
+	PRIVATE
+    # For OpenEXR/Imath 3.x:
+      $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+      $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+      $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
+    # For OpenEXR 2.4/2.5:
+      $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+      $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
+      $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
+      $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
+      $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
 )
 
 add_test(IlmCtl IlmCtlTest)

diff --git a/unittest/IlmCtlMath/CMakeLists.txt b/unittest/IlmCtlMath/CMakeLists.txt
@@ -15,6 +15,17 @@ target_link_libraries(IlmCtlMathTest
 	PRIVATE
 		IlmCtlMath
 		IlmCtl
+	PRIVATE
+    # For OpenEXR/Imath 3.x:
+      $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+      $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+      $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
+    # For OpenEXR 2.4/2.5:
+      $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+      $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
+      $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
+      $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
+      $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
 )
 
 add_test(IlmCtlMath IlmCtlMathTest)
diff --git a/unittest/IlmImfCtl/CMakeLists.txt b/unittest/IlmImfCtl/CMakeLists.txt
@@ -17,6 +17,17 @@ target_link_libraries( IlmImfCtlTest
 		IlmCtlSimd
 		IlmCtlMath
 		IlmCtl
+	PRIVATE
+    # For OpenEXR/Imath 3.x:
+      $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
+      $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
+      $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
+    # For OpenEXR 2.4/2.5:
+      $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
+      $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
+      $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
+      $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
+      $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
 )
 
 add_test( IlmImfCtl IlmImfCtlTest )