Skip to content

Commit ba7478c

Browse files
committed
fix build
Signed-off-by: Anton Dukhovnikov <[email protected]>
1 parent 1804704 commit ba7478c

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/rawtoaces/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ set_property(TARGET rawtoaces PROPERTY CXX_STANDARD 17)
1010
target_link_libraries ( rawtoaces
1111
PUBLIC
1212
${RAWTOACESLIB}
13-
INTERFACE
14-
Boost::headers
13+
# INTERFACE
14+
# Boost::headers
1515
)
1616

1717
if ( LIBRAW_CONFIG_FOUND )

src/rawtoaces_idt/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@ add_library( ${RAWTOACESIDTLIB} ${DO_SHARED}
1313

1414
set_property(TARGET ${RAWTOACESIDTLIB} PROPERTY CXX_STANDARD 17)
1515

16+
# Eigen is also used in rawtoaces_util and rawtoaces_util2, so setting it public here
1617
target_link_libraries(
1718
${RAWTOACESIDTLIB}
19+
PUBLIC
20+
Eigen3::Eigen
1821
PRIVATE
1922
Boost::boost
2023
Boost::system
2124
Imath::Imath
2225
Imath::ImathConfig
2326
)
2427

28+
# Ceres is also used in rawtoaces_util and rawtoaces_util2, so setting it public here
2529
if ( ${Ceres_VERSION_MAJOR} GREATER 1 )
2630
target_link_libraries( ${RAWTOACESIDTLIB} PUBLIC Ceres::ceres )
2731
else ()

src/rawtoaces_util/CMakeLists.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,20 @@ add_library ( ${RAWTOACESLIB} ${DO_SHARED}
1010

1111
set_property(TARGET ${RAWTOACESLIB} PROPERTY CXX_STANDARD 17)
1212

13-
if ( AcesContainer_FOUND )
14-
target_include_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_INCLUDE_DIRS} )
15-
target_link_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_LIBRARY_DIRS} )
16-
target_link_libraries ( ${RAWTOACESLIB}
17-
PRIVATE
18-
${AcesContainer_LIBRARIES}
19-
${AcesContainer_LDFLAGS_OTHER}
20-
)
21-
endif()
13+
target_include_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_INCLUDE_DIRS} )
14+
target_link_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_LIBRARY_DIRS} )
15+
target_link_libraries ( ${RAWTOACESLIB}
16+
PRIVATE
17+
${AcesContainer_LIBRARIES}
18+
${AcesContainer_LDFLAGS_OTHER}
19+
)
2220

2321
target_link_libraries ( ${RAWTOACESLIB}
2422
PUBLIC
2523
${RAWTOACESIDTLIB}
24+
PRIVATE
2625
Boost::filesystem
27-
INTERFACE
28-
Eigen3::Eigen
26+
# Eigen3::Eigen
2927
Imath::Imath
3028
Imath::ImathConfig
3129
)

0 commit comments

Comments
 (0)