ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/embree3/fix-path.patch

   1 diff --git a/common/algorithms/CMakeLists.txt b/common/algorithms/CMakeLists.txt
   2 index 5667d2bd3..cb26776a4 100644
   3 --- a/common/algorithms/CMakeLists.txt
   4 +++ b/common/algorithms/CMakeLists.txt
   5 @@ -17,11 +17,4 @@ ADD_LIBRARY(algorithms OBJECT
   6  SET_PROPERTY(TARGET algorithms PROPERTY FOLDER common)
   7  SET_PROPERTY(TARGET algorithms APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
   8
   9 -# ideally we would use target_link_libraries to provide the algorithms target
  10 -# with the TBB include directory information. Howeve, this is only possible in
  11 -# very recent versions of TBB and therefore we use the target property instead
  12 -GET_TARGET_PROPERTY(tasking_include_dirs tasking INCLUDE_DIRECTORIES)
  13 -if (tasking_include_dirs)
  14 -  TARGET_INCLUDE_DIRECTORIES(algorithms PUBLIC "${tasking_include_dirs}")
  15 -  GET_TARGET_PROPERTY(algorithms_include_dirs algorithms INCLUDE_DIRECTORIES)
  16 -endif()
  17 +TARGET_LINK_LIBRARIES(algorithms PUBLIC tasking)
  18 diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake
  19 index 9b7370ccd..14ce929d6 100644
  20 --- a/common/cmake/embree-config.cmake
  21 +++ b/common/cmake/embree-config.cmake
  22 @@ -5,8 +5,6 @@ SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@)
  23  GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE)
  24
  25  SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
  26 -SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
  27 -SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
  28
  29  SET(EMBREE_VERSION @EMBREE_VERSION@)
  30  SET(EMBREE_VERSION_MAJOR @EMBREE_VERSION_MAJOR@)
  31 @@ -22,7 +20,6 @@ SET(EMBREE_ISA_AVX2  @EMBREE_ISA_AVX2@)
  32  SET(EMBREE_ISA_AVX512KNL @EMBREE_ISA_AVX512KNL@)
  33  SET(EMBREE_ISA_AVX512SKX @EMBREE_ISA_AVX512SKX@)
  34
  35 -SET(EMBREE_BUILD_TYPE @CMAKE_BUILD_TYPE@)
  36  SET(EMBREE_ISPC_SUPPORT @EMBREE_ISPC_SUPPORT@)
  37  SET(EMBREE_STATIC_LIB @EMBREE_STATIC_LIB@)
  38  SET(EMBREE_TUTORIALS @EMBREE_TUTORIALS@)
  39 @@ -53,10 +50,6 @@ IF (EMBREE_STATIC_LIB)
  40    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/simd-targets.cmake")
  41    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/lexers-targets.cmake")
  42    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/tasking-targets.cmake")
  43 -
  44 -  add_library(TBB::tbb SHARED IMPORTED)
  45 -  set_target_properties(TBB::tbb PROPERTIES IMPORTED_LOCATION "${EMBREE_ROOT_DIR}/@EMBREE_INSTALLED_TBB@")
  46 -
  47  ENDIF()
  48
  49  INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree-targets.cmake")
  50 diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
  51 index a4da0001a..b6f82e981 100644
  52 --- a/common/cmake/package.cmake
  53 +++ b/common/cmake/package.cmake
  54 @@ -20,16 +20,6 @@ ELSE()
  55    ENDIF()
  56  ENDIF()
  57
  58 -##############################################################
  59 -# Install MSVC runtime
  60 -##############################################################
  61 -
  62 -IF (WIN32)
  63 -  SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
  64 -  INCLUDE(InstallRequiredSystemLibraries)
  65 -  LIST(FILTER CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS INCLUDE REGEX ".*msvcp[0-9]+\.dll|.*vcruntime[0-9]+\.dll|.*vcruntime[0-9]+_[0-9]+\.dll")
  66 -  INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT lib)
  67 -ENDIF()
  68
  69  ##############################################################
  70  # Install Headers
  71 @@ -106,18 +96,9 @@ ELSE()
  72    ENDIF()
  73  ENDIF()
  74
  75 -IF (WIN32 OR EMBREE_ZIP_MODE)
  76 -  # for local "installs" and on Windows we want the cmake config files placed
  77 -  # in the install root, such that users can point the CMake variable
  78 -  # embree_DIR just to the install folder
  79 -  SET(EMBREE_CMAKECONFIG_DIR ".")
  80 -  SET(EMBREE_CMAKEEXPORT_DIR "cmake")
  81 -  SET(EMBREE_RELATIV_ROOT_DIR ".")
  82 -ELSE()
  83 -  SET(EMBREE_CMAKECONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/embree-${EMBREE_VERSION}")
  84 -  SET(EMBREE_CMAKEEXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/embree-${EMBREE_VERSION}")
  85 -  FILE(RELATIVE_PATH EMBREE_RELATIV_ROOT_DIR "/${EMBREE_CMAKECONFIG_DIR}" "/")
  86 -ENDIF()
  87 +SET(EMBREE_CMAKECONFIG_DIR "share/embree")
  88 +SET(EMBREE_CMAKEEXPORT_DIR "share/embree3")
  89 +SET(EMBREE_RELATIV_ROOT_DIR "../..")
  90
  91  CONFIGURE_FILE(common/cmake/embree-config.cmake embree-config-install.cmake @ONLY)
  92  CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cmake @ONLY)
  93 diff --git a/common/tasking/CMakeLists.txt b/common/tasking/CMakeLists.txt
  94 index 71ef29612..c846004e3 100644
  95 --- a/common/tasking/CMakeLists.txt
  96 +++ b/common/tasking/CMakeLists.txt
  97 @@ -10,7 +10,7 @@ ELSEIF (TASKING_TBB)
  98    if (NOT ${EMBREE_TBB_ROOT} STREQUAL "")
  99      set(TBB_ROOT ${EMBREE_TBB_ROOT})
 100    endif()
 101 -  FIND_PACKAGE(TBB REQUIRED tbb)
 102 +  FIND_PACKAGE(TBB CONFIG REQUIRED tbb)
 103
 104    ##############################################################
 105    # Create tasking target and link against TBB. Also set include directory
 106 @@ -18,10 +18,7 @@ ELSEIF (TASKING_TBB)
 107    # with the TBB header files
 108    ##############################################################
 109    ADD_LIBRARY(tasking STATIC taskschedulertbb.cpp)
 110 -  TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
 111 -  TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC "${TBB_INCLUDE_DIRS}")
 112 -
 113 -  include(installTBB)
 114 +  TARGET_LINK_LIBRARIES(tasking PUBLIC TBB::tbb)
 115
 116  ELSEIF (TASKING_PPL)
 117    ADD_LIBRARY(tasking STATIC taskschedulerppl.cpp)