Skip to content

Commit 2715559

Browse files
committed
Changed acescontainer to public for rawtoaces_util
Signed-off-by: Mikael Sundell <[email protected]>
1 parent a5d4973 commit 2715559

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

cmake/modules/FindLibRaw.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ if(PKG_CONFIG_FOUND)
1515
pkg_check_modules(PC_LibRaw QUIET libraw)
1616
endif()
1717

18-
# Brew special handling for macOS
1918
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND PC_LibRaw_FOUND AND "${PC_LibRaw_INCLUDEDIR}" MATCHES ".*/Cellar/.*")
2019
set(_LibRaw_HINT_INCLUDE /usr/local/include)
2120
set(_LibRaw_HINT_LIB /usr/local/lib)
2221
endif()
2322

24-
# Hints from pkg-config
2523
if(PC_LibRaw_FOUND)
2624
set(LibRaw_CFLAGS ${PC_LibRaw_CFLAGS_OTHER})
2725
set(LibRaw_LIBRARY_DIRS ${PC_LibRaw_LIBRARY_DIRS})
@@ -32,7 +30,6 @@ if(PC_LibRaw_FOUND)
3230
endif()
3331
endif()
3432

35-
# Locate header
3633
find_path(LibRaw_INCLUDE_DIR libraw/libraw.h
3734
HINTS ${_LibRaw_HINT_INCLUDE}
3835
)
@@ -44,20 +41,17 @@ if(LibRaw_INCLUDE_DIR AND EXISTS "${LibRaw_INCLUDE_DIR}/libraw_version.h")
4441
"\\1" LibRaw_VERSION "${libraw_version_str}")
4542
endif()
4643

47-
# Locate library
4844
find_library(LibRaw_LIBRARY
4945
NAMES raw libraw
5046
HINTS ${_LibRaw_HINT_LIB}
5147
)
5248

53-
# Handle required variables
5449
include(FindPackageHandleStandardArgs)
5550
find_package_handle_standard_args(LibRaw
5651
REQUIRED_VARS LibRaw_LIBRARY LibRaw_INCLUDE_DIR
5752
VERSION_VAR LibRaw_VERSION
5853
)
5954

60-
# Set include and libs
6155
if(LibRaw_FOUND)
6256
set(LibRaw_INCLUDE_DIRS ${LibRaw_INCLUDE_DIR})
6357
set(LibRaw_LIBRARIES ${LibRaw_LIBRARY})

src/rawtoaces_util/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ target_link_libraries(${RAWTOACESLIB}
2727
)
2828

2929
if (AcesContainer_FOUND)
30-
target_include_directories(${RAWTOACESLIB} PRIVATE ${AcesContainer_INCLUDE_DIRS})
31-
target_link_directories(${RAWTOACESLIB} PRIVATE ${AcesContainer_LIBRARY_DIRS})
32-
target_link_libraries(${RAWTOACESLIB} PRIVATE ${AcesContainer_LIBRARIES})
30+
target_include_directories(${RAWTOACESLIB} PUBLIC ${AcesContainer_INCLUDE_DIRS})
31+
target_link_directories(${RAWTOACESLIB} PUBLIC ${AcesContainer_LIBRARY_DIRS})
32+
target_link_libraries(${RAWTOACESLIB} PUBLIC ${AcesContainer_LIBRARIES})
3333
endif()
3434

3535
if (TARGET LibRaw::LibRaw)

0 commit comments

Comments
 (0)