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)
351
351
set (FMT_INCLUDE_DIR "${FMT_INSTALL_DIR} /include" )
352
352
set (OIIO_USING_FMT_LOCAL TRUE )
353
353
set (fmt_VERSION ${BUILD_FMT_VERSION} )
354
- add_library (fmt::fmt INTERFACE IMPORTED )
355
354
else ()
356
355
get_target_property (FMT_INCLUDE_DIR fmt::fmt INTERFACE_INCLUDE_DIRECTORIES )
357
356
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)
87
87
${fmt_headers}
88
88
${fmt_internal_directory} )
89
89
add_custom_target (fmt_internal DEPENDS ${fmt_headers_internal} )
90
- add_dependencies ( fmt::fmt fmt_internal )
90
+ set ( fmt_target fmt_internal )
91
91
else ()
92
92
set (fmt_headers
93
93
${CMAKE_BINARY_DIR} /include/OpenImageIO/detail/fmt/format.h
@@ -102,6 +102,7 @@ else ()
102
102
file (WRITE "${CMAKE_BINARY_DIR} /include/OpenImageIO/detail/fmt/std.h"
103
103
"#include <fmt/std.h>" )
104
104
endif ()
105
+ set (fmt_target fmt::fmt )
105
106
endif ()
106
107
install (FILES ${fmt_headers}
107
108
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
143
143
OpenImageIO_Util
144
144
${OPENIMAGEIO_IMATH_DEPENDENCY_VISIBILITY}
145
145
${OPENIMAGEIO_IMATH_TARGETS}
146
- fmt::fmt
146
+ ${fmt_target}
147
147
PRIVATE
148
148
${OPENIMAGEIO_OPENEXR_TARGETS}
149
149
${OpenCV_LIBRARIES}
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ target_link_libraries (OpenImageIO_Util
20
20
${GCC_ATOMIC_LIBRARIES}
21
21
${OPENIMAGEIO_IMATH_DEPENDENCY_VISIBILITY}
22
22
${OPENIMAGEIO_IMATH_TARGETS}
23
- fmt::fmt
23
+ ${fmt_target}
24
24
PRIVATE
25
25
$< TARGET_NAME_IF_EXISTS:Boost::filesystem>
26
26
$< TARGET_NAME_IF_EXISTS:Boost::thread>
You can’t perform that action at this time.
0 commit comments