Changed back acescontainer to private

Code clean-up

Signed-off-by: Mikael Sundell <[email protected]>

Author: mikaelsundell

src/rawtoaces_idt/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
-include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library( ${RAWTOACESIDTLIB} ${DO_SHARED}
+add_library(${RAWTOACESIDTLIB} ${DO_SHARED}
     rta.cpp
     ../../include/rawtoaces/define.h
     ../../include/rawtoaces/mathOps.h
@@ -14,45 +14,45 @@ target_include_directories(${RAWTOACESIDTLIB}
         $<INSTALL_INTERFACE:include>
 )
 
-target_link_libraries(
-    ${RAWTOACESIDTLIB}
+target_link_libraries(${RAWTOACESIDTLIB}
     PUBLIC
-	    Eigen3::Eigen
+        Eigen3::Eigen
 )
 
 target_link_libraries(${RAWTOACESIDTLIB}
     PRIVATE
-        Eigen3::Eigen
         Boost::filesystem
         Boost::system
+        Imath::Imath
+        Imath::ImathConfig
 )
 
-if (TARGET libraw::raw)
-    target_link_libraries(${RAWTOACESIDTLIB} PUBLIC libraw::raw)
+if (TARGET LibRaw::LibRaw)
+    target_link_libraries(${RAWTOACESIDTLIB} PUBLIC LibRaw::LibRaw)
 else()
-    if (libraw_INCLUDE_DIRS)
-        target_include_directories(${RAWTOACESIDTLIB} PUBLIC ${LibRaw_INCLUDE_DIRS})
+    if (LibRaw_INCLUDE_DIRS)
+        target_include_directories(${RAWTOACESIDTLIB}
+            PUBLIC $<BUILD_INTERFACE:${LibRaw_INCLUDE_DIRS}>
+        )
     endif()
-    if (libraw_LIBRARY_DIRS)
+    if (LibRaw_LIBRARY_DIRS)
         target_link_directories(${RAWTOACESIDTLIB} PRIVATE ${LibRaw_LIBRARY_DIRS})
     endif()
-    if (libraw_LIBRARIES)
+    if (LibRaw_LIBRARIES)
         target_link_libraries(${RAWTOACESIDTLIB} PUBLIC ${LibRaw_LIBRARIES} ${LibRaw_LDFLAGS_OTHER})
     endif()
 endif()
 
-target_link_libraries(${RAWTOACESIDTLIB}
-    PRIVATE
-        Imath::Imath
-        Imath::ImathConfig
-)
-
-if ( ${Ceres_VERSION_MAJOR} GREATER 1 )
-    target_link_libraries( ${RAWTOACESIDTLIB} PUBLIC Ceres::ceres )
-else ()
-    target_include_directories(${RAWTOACESIDTLIB} PUBLIC ${CERES_INCLUDE_DIRS})
+if (${Ceres_VERSION_MAJOR} GREATER 1)
+    target_link_libraries(${RAWTOACESIDTLIB} PUBLIC Ceres::ceres)
+else()
+    if (CERES_INCLUDE_DIRS)
+        target_include_directories(${RAWTOACESIDTLIB}
+            PUBLIC $<BUILD_INTERFACE:${CERES_INCLUDE_DIRS}>
+        )
+    endif()
     target_link_libraries(${RAWTOACESIDTLIB} PUBLIC ${CERES_LIBRARIES})
-endif ()
+endif()
 
 set(RAWTOACESIDT_HEADERS
     ${PROJECT_SOURCE_DIR}/include/rawtoaces/define.h

src/rawtoaces_util/CMakeLists.txt

@@ -27,13 +27,13 @@ target_link_libraries(${RAWTOACESLIB}
 )
 
 if (AcesContainer_FOUND)
-    target_include_directories(${RAWTOACESLIB} PUBLIC ${AcesContainer_INCLUDE_DIRS})
-    target_link_directories(${RAWTOACESLIB} PUBLIC ${AcesContainer_LIBRARY_DIRS})
-    target_link_libraries(${RAWTOACESLIB}
-        PUBLIC
-            ${AcesContainer_LIBRARIES}
-            ${AcesContainer_LDFLAGS_OTHER}
-    )
+    if (TARGET AcesContainer::AcesContainer)
+        target_link_libraries(${RAWTOACESLIB} PRIVATE AcesContainer::AcesContainer)
+    else()
+        target_include_directories(${RAWTOACESLIB} PRIVATE $<BUILD_INTERFACE:${AcesContainer_INCLUDE_DIRS}>)
+        target_link_directories(${RAWTOACESLIB} PRIVATE ${AcesContainer_LIBRARY_DIRS})
+        target_link_libraries(${RAWTOACESLIB} PRIVATE ${AcesContainer_LIBRARIES})
+    endif()
 endif()
 
 if (TARGET LibRaw::LibRaw)