update ceph source to reef 18.1.2

[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / parallelstl / fix-cmakelist.patch

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/parallelstl/fix-cmakelist.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/parallelstl/fix-cmakelist.patch
new file mode 100644 (file)
index 0000000..01a2c22
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/parallelstl/fix-cmakelist.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt\r
+index 878b212..caa3cba 100644\r
+--- a/CMakeLists.txt\r
++++ b/CMakeLists.txt\r
+@@ -44,7 +44,7 @@ add_library(pstl::ParallelSTL ALIAS ParallelSTL)\r
+ if (PARALLELSTL_USE_PARALLEL_POLICIES)\r
+     message(STATUS "Using Parallel Policies")\r
+     if (PARALLELSTL_BACKEND STREQUAL "tbb")\r
+-        find_package(TBB 2018 REQUIRED tbb OPTIONAL_COMPONENTS tbbmalloc)\r
++        find_package(TBB CONFIG REQUIRED tbb OPTIONAL_COMPONENTS tbbmalloc)\r
+         message(STATUS "Parallel STL uses TBB ${TBB_VERSION} (interface version: ${TBB_INTERFACE_VERSION})")\r
+         target_link_libraries(ParallelSTL INTERFACE TBB::tbb)\r
+       else()\r
+@@ -64,8 +64,7 @@ target_include_directories(ParallelSTL\r
+     INTERFACE\r
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>\r
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stdlib>\r
+-    $<INSTALL_INTERFACE:include>\r
+-    $<INSTALL_INTERFACE:stdlib>)\r
++    $<INSTALL_INTERFACE:include>)\r
+ \r
+ target_compile_features(ParallelSTL\r
+     INTERFACE\r
+@@ -100,6 +99,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake"\r
+         DESTINATION lib/cmake/ParallelSTL)\r
+ install(DIRECTORY include/pstl\r
+         DESTINATION include)\r
++file(GLOB STDLIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/pstl/*)\r
++install(FILES ${STDLIB_HEADERS} DESTINATION include/pstl)\r
+ \r
+ add_custom_target(install-pstl\r
+                   COMMAND "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_install.cmake" -DCOMPONENT=ParallelSTL)\r