File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed
Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -351,7 +351,6 @@ macro (find_or_download_fmt)
351351 set (FMT_INCLUDE_DIR "${FMT_INSTALL_DIR} /include" )
352352 set (OIIO_USING_FMT_LOCAL TRUE )
353353 set (fmt_VERSION ${BUILD_FMT_VERSION} )
354- add_library (fmt::fmt INTERFACE IMPORTED )
355354 else ()
356355 get_target_property (FMT_INCLUDE_DIR fmt::fmt INTERFACE_INCLUDE_DIRECTORIES )
357356 set (OIIO_USING_FMT_LOCAL FALSE )
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ if (INTERNALIZE_FMT OR OIIO_USING_FMT_LOCAL)
8787 ${fmt_headers}
8888 ${fmt_internal_directory} )
8989 add_custom_target (fmt_internal DEPENDS ${fmt_headers_internal} )
90- add_dependencies (fmt::fmt fmt_internal)
90+ set (fmt_target fmt_internal)
9191else ()
9292 set (fmt_headers
9393 ${CMAKE_BINARY_DIR} /include /OpenImageIO/detail/fmt/format.h
@@ -102,6 +102,7 @@ else ()
102102 file (WRITE "${CMAKE_BINARY_DIR} /include/OpenImageIO/detail/fmt/std.h"
103103 "#include <fmt/std.h>" )
104104 endif ()
105+ set (fmt_target fmt::fmt)
105106endif ()
106107install (FILES ${fmt_headers}
107108 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} /${PROJECT_NAME} /detail/fmt
Original file line number Diff line number Diff line change @@ -143,7 +143,7 @@ target_link_libraries (OpenImageIO
143143 OpenImageIO_Util
144144 ${OPENIMAGEIO_IMATH_DEPENDENCY_VISIBILITY}
145145 ${OPENIMAGEIO_IMATH_TARGETS}
146- fmt::fmt
146+ ${fmt_target}
147147 PRIVATE
148148 ${OPENIMAGEIO_OPENEXR_TARGETS}
149149 ${OpenCV_LIBRARIES}
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ target_link_libraries (OpenImageIO_Util
2020 ${GCC_ATOMIC_LIBRARIES}
2121 ${OPENIMAGEIO_IMATH_DEPENDENCY_VISIBILITY}
2222 ${OPENIMAGEIO_IMATH_TARGETS}
23- fmt::fmt
23+ ${fmt_target}
2424 PRIVATE
2525 $<TARGET_NAME_IF_EXISTS:Boost::filesystem>
2626 $<TARGET_NAME_IF_EXISTS:Boost::thread>
You can’t perform that action at this time.
0 commit comments