update ceph source to reef 18.1.2

[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / ompl / fix_dependency.patch

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ompl/fix_dependency.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ompl/fix_dependency.patch
new file mode 100644 (file)
index 0000000..4a19f81
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ompl/fix_dependency.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt\r
+index 4c7e6901..a433b7da 100644\r
+--- a/CMakeLists.txt\r
++++ b/CMakeLists.txt\r
+@@ -136,7 +136,7 @@ find_package(Drawstuff QUIET)\r
+ set_package_properties(assimp PROPERTIES\r
+     URL "http://assimp.org"\r
+     PURPOSE "Used in ompl_app for reading meshes representing robots and environments.")\r
+-find_package(assimp REQUIRED)\r
++find_package(assimp CONFIG REQUIRED)\r
+ set_package_properties(ccd PROPERTIES\r
+     URL "https://github.com/danfis/libccd"\r
+     PURPOSE "Collision detection library used by fcl.")\r
+@@ -178,8 +178,7 @@ include_directories(\r
+     "${OMPLAPP_INCLUDE_DIRS}"\r
+     "${OMPL_INCLUDE_DIRS}"\r
+     "${EIGEN3_INCLUDE_DIR}"\r
+-    "${FCL_INCLUDE_DIRS}"\r
+-    "${ASSIMP_INCLUDE_DIRS}")\r
++    "${FCL_INCLUDE_DIRS}")\r
+ \r
+ # ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was\r
+ # enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most\r
+@@ -195,7 +194,7 @@ set(OMPLAPP_MODULE_LIBRARIES\r
+     ${FCL_LIBRARIES})\r
+ set(OMPLAPP_LIBRARIES\r
+     ${OPENGL_LIBRARIES}\r
+-    ${ASSIMP_LIBRARIES}\r
++    assimp::assimp\r
+     ${FCL_LIBRARIES})\r
+ link_directories(${ASSIMP_LIBRARY_DIRS} ${CCD_LIBRARY_DIRS} ${OCTOMAP_LIBRARY_DIRS} ${FCL_LIBRARY_DIRS})\r
+ \r