]> git.proxmox.com Git - ceph.git/blobdiff - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / opencolorio-tools / 0005-tinyxml-dependency-search.patch
diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch
new file mode 100644 (file)
index 0000000..319f88b
--- /dev/null
@@ -0,0 +1,18 @@
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 45e55f9..f4b687d 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -77,7 +77,12 @@ endif()
+ if(OCIO_BUILD_STATIC)
+     list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp)
+     add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files})
+-    add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
++
++    if(USE_EXTERNAL_TINYXML)
++        target_link_libraries(OpenColorIO_STATIC ${TINYXML_LIBRARIES})
++    else(USE_EXTERNAL_TINYXML)
++        add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
++    endif(USE_EXTERNAL_TINYXML)
+     if(USE_EXTERNAL_YAML)
+         target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES})