fix build

Signed-off-by: Anton Dukhovnikov <[email protected]>

Author: antond-weta

.github/workflows/ci.yml

@@ -100,15 +100,18 @@ jobs:
             c_compiler: gcc
             cpp_compiler: g++
             install_deps: install_deps_linux
+            build_shared_libs: ON
           - title: ubuntu
             os: ubuntu-24.04
             cpp_compiler: clang++
             install_deps: install_deps_linux
+            build_shared_libs: ON
           - title: macos
             os: macos-latest
             c_compiler: clang
             cpp_compiler: clang++
             install_deps: install_deps_mac
+            build_shared_libs: ON
         exclude:
           - title: windows
             c_compiler: gcc

CMakeLists.txt

@@ -64,7 +64,6 @@ else ()
   set ( DO_SHARED STATIC )
 endif ()
 
-include ( GNUInstallDirs )
 include ( configure.cmake )
 
 
@@ -98,25 +97,6 @@ install( FILES
 
 
 
-install(
-    TARGETS rawtoaces_idt rawtoaces_util rawtoaces_util2 rawtoaces
-    EXPORT RawToAcesConfig
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-export(
-    TARGETS rawtoaces_idt rawtoaces_util rawtoaces_util2 rawtoaces
-    NAMESPACE RawToAces::
-    FILE "${CMAKE_CURRENT_BINARY_DIR}/RawToAcesConfig.cmake"
-)
-
-install(
-    EXPORT RawToAcesConfig
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/CMake/RawToAces"
-    NAMESPACE RawToAces::
-)
 
 
 
@@ -127,6 +107,28 @@ install( FILES "${PROJECT_BINARY_DIR}/RAWTOACESLibraryDepends.cmake" DESTINATION
 endif( )
 
 if ( APPLE OR UNIX )
+	include ( GNUInstallDirs )
+
+	install(
+        TARGETS rawtoaces_idt rawtoaces_util rawtoaces_util2 rawtoaces
+        EXPORT RawToAcesConfig
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+
+    export(
+        TARGETS rawtoaces_idt rawtoaces_util rawtoaces_util2 rawtoaces
+        NAMESPACE RawToAces::
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/RawToAcesConfig.cmake"
+    )
+
+    install(
+        EXPORT RawToAcesConfig
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/CMake/RawToAces"
+        NAMESPACE RawToAces::
+    )
+
 	install (DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATADIR}/rawtoaces)
 endif()
 

build_scripts/install_aces_container.bash

@@ -2,23 +2,23 @@
 
 set -ex
 
-git clone https://github.com/ampas/aces_container.git aces_container
+git clone https://github.com/ampas/aces_container.git ../aces_container
 
 if [[ "$OSTYPE" == "linux-gnu"* ]] || [[ "$OSTYPE" == "darwin"* ]]; then
     cmake \
-        -S aces_container \
-        -B aces_container/build \
+        -S ../aces_container \
+        -B ../aces_container/build \
         -DCMAKE_CXX_FLAGS="-Wno-c++11-narrowing"
-    cmake --build aces_container/build
-    sudo cmake --install aces_container/build
+    cmake --build ../aces_container/build
+    sudo cmake --install ../aces_container/build
 else
     cmake \
-        -S aces_container \
-        -B aces_container/build \
-        -DCMAKE_INSTALL_PREFIX="." \
+        -S ../aces_container \
+        -B ../aces_container/build \
+        -DCMAKE_INSTALL_PREFIX="../AcesContainer" \
         -DBUILD_SHARED_LIBS=OFF
-    cmake --build aces_container/build --config Release
-    cmake --install aces_container/build --config Release
+    cmake --build ../aces_container/build --config Release
+    cmake --install ../aces_container/build --config Release
 fi
 
 cd ../..

configure.cmake

@@ -1,7 +1,7 @@
 # Until we get some of these modules into the upstream packages, put them here
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake")
-
+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${CMAKE_SOURCE_DIR}/../")
 
 find_package ( OpenImageIO   CONFIG REQUIRED )
 find_package ( AcesContainer CONFIG REQUIRED )

src/rawtoaces/CMakeLists.txt

@@ -7,16 +7,9 @@ add_executable( rawtoaces
 
 set_property(TARGET rawtoaces PROPERTY CXX_STANDARD 17)
 
-target_include_directories( rawtoaces
-    PUBLIC
-        ${AcesContainer_INCLUDE_DIRS}
-)
-
 target_link_libraries ( rawtoaces
     PUBLIC
         ${RAWTOACESLIB}
-    INTERFACE
-        Boost::headers
 )
 
 if ( LIBRAW_CONFIG_FOUND )

src/rawtoaces_idt/CMakeLists.txt

@@ -13,15 +13,19 @@ add_library( ${RAWTOACESIDTLIB} ${DO_SHARED}
 
 set_property(TARGET ${RAWTOACESIDTLIB} PROPERTY CXX_STANDARD 17)
 
+# Eigen is also used in rawtoaces_util and rawtoaces_util2, so setting it public here
 target_link_libraries(
     ${RAWTOACESIDTLIB}
+    PUBLIC
+        Eigen3::Eigen
     PRIVATE
         Boost::boost
         Boost::system
         Imath::Imath
         Imath::ImathConfig
 )
 
+# Ceres is also used in rawtoaces_util and rawtoaces_util2, so setting it public here
 if ( ${Ceres_VERSION_MAJOR} GREATER 1 )
     target_link_libraries( ${RAWTOACESIDTLIB} PUBLIC Ceres::ceres )
 else ()

src/rawtoaces_util/CMakeLists.txt

@@ -10,29 +10,27 @@ add_library ( ${RAWTOACESLIB} ${DO_SHARED}
 
 set_property(TARGET ${RAWTOACESLIB} PROPERTY CXX_STANDARD 17)
 
-if ( AcesContainer_FOUND )
-    target_include_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_INCLUDE_DIRS} )
-    target_link_directories    ( ${RAWTOACESLIB} PUBLIC  ${AcesContainer_LIBRARY_DIRS} )
-    target_link_libraries      ( ${RAWTOACESLIB}
-        PRIVATE
-            ${AcesContainer_LIBRARIES}
-            ${AcesContainer_LDFLAGS_OTHER}
-    )
-endif()
+target_include_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_INCLUDE_DIRS} )
+target_link_directories    ( ${RAWTOACESLIB} PUBLIC ${AcesContainer_LIBRARY_DIRS} )
+target_link_libraries      ( ${RAWTOACESLIB}
+    PUBLIC
+        ${AcesContainer_LIBRARIES}
+        ${AcesContainer_LDFLAGS_OTHER}
+)
 
 target_link_libraries ( ${RAWTOACESLIB}
     PUBLIC
         ${RAWTOACESIDTLIB}
+    PRIVATE
         Boost::filesystem
-    INTERFACE
-        Eigen3::Eigen
         Imath::Imath
         Imath::ImathConfig
 )
 
 if ( LIBRAW_CONFIG_FOUND )
     target_link_libraries ( ${RAWTOACESLIB} PUBLIC libraw::raw )
 else ()
+    target_include_directories(${RAWTOACESLIB} PUBLIC ${libraw_INCLUDE_DIR}/..)
     target_link_directories(${RAWTOACESLIB} PUBLIC ${libraw_LIBRARY_DIRS} )
     target_link_libraries(${RAWTOACESLIB} PUBLIC ${libraw_LIBRARIES} ${libraw_LDFLAGS_OTHER} )
 endif ()