diff options
Diffstat (limited to 'vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch')
| -rw-r--r-- | vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch b/vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch new file mode 100644 index 0000000..24e40bb --- /dev/null +++ b/vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7ec920..6f46641 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,8 +75,8 @@ if(XTENSOR_USE_XSIMD) + endif() + + if(XTENSOR_USE_TBB) +- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") +- find_package(TBB REQUIRED) ++ #set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") ++ find_package(TBB CONFIG REQUIRED) + message(STATUS "Found intel TBB: ${TBB_INCLUDE_DIRS}") + endif() + +@@ -260,7 +260,7 @@ export(EXPORT ${PROJECT_NAME}-targets + install(DIRECTORY ${XTENSOR_INCLUDE_DIR}/xtensor + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + +-set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE ++set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE + STRING "install path for xtensorConfig.cmake") + + configure_package_config_file(${PROJECT_NAME}Config.cmake.in +@@ -287,7 +287,7 @@ configure_file(${PROJECT_NAME}.pc.in + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" + @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + + # Write single include + # ==================== |