mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-03 16:40:05 +08:00
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 7535649..5c93655 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()
|
||
|
|
|
||
|
|
@@ -261,7 +261,7 @@ export(EXPORT ${PROJECT_NAME}-targets
|
||
|
|
install(FILES ${XTENSOR_HEADERS}
|
||
|
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor)
|
||
|
|
|
||
|
|
-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
|
||
|
|
@@ -288,7 +288,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
|
||
|
|
# ====================
|