diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-01-06 11:19:13 -0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-06 11:19:13 -0800 |
| commit | 020923a98dac40b55098170ae3dcb65a4eab58b5 (patch) | |
| tree | fa3aa7f6fdfc1595dd8a4b25faefa1967d70e59a /ports/parallelstl/fix-cmakelist.patch | |
| parent | 773e835687475c1b01f200e3d65857c457f2c158 (diff) | |
| download | vcpkg-020923a98dac40b55098170ae3dcb65a4eab58b5.tar.gz vcpkg-020923a98dac40b55098170ae3dcb65a4eab58b5.zip | |
[parallelstl] Update to latest version and fix find_package unable to find ParallelSTLConfig.cmake (#9443)
* [parallelstl] Fix find_package unable to find ParallelSTLConfig.cmake
* Add stdlib headers
Diffstat (limited to 'ports/parallelstl/fix-cmakelist.patch')
| -rw-r--r-- | ports/parallelstl/fix-cmakelist.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/ports/parallelstl/fix-cmakelist.patch b/ports/parallelstl/fix-cmakelist.patch new file mode 100644 index 000000000..01a2c2271 --- /dev/null +++ b/ports/parallelstl/fix-cmakelist.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 878b212..caa3cba 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library(pstl::ParallelSTL ALIAS ParallelSTL)
+ if (PARALLELSTL_USE_PARALLEL_POLICIES)
+ message(STATUS "Using Parallel Policies")
+ if (PARALLELSTL_BACKEND STREQUAL "tbb")
+- find_package(TBB 2018 REQUIRED tbb OPTIONAL_COMPONENTS tbbmalloc)
++ find_package(TBB CONFIG REQUIRED tbb OPTIONAL_COMPONENTS tbbmalloc)
+ message(STATUS "Parallel STL uses TBB ${TBB_VERSION} (interface version: ${TBB_INTERFACE_VERSION})")
+ target_link_libraries(ParallelSTL INTERFACE TBB::tbb)
+ else()
+@@ -64,8 +64,7 @@ target_include_directories(ParallelSTL
+ INTERFACE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stdlib>
+- $<INSTALL_INTERFACE:include>
+- $<INSTALL_INTERFACE:stdlib>)
++ $<INSTALL_INTERFACE:include>)
+
+ target_compile_features(ParallelSTL
+ INTERFACE
+@@ -100,6 +99,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake"
+ DESTINATION lib/cmake/ParallelSTL)
+ install(DIRECTORY include/pstl
+ DESTINATION include)
++file(GLOB STDLIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/pstl/*)
++install(FILES ${STDLIB_HEADERS} DESTINATION include/pstl)
+
+ add_custom_target(install-pstl
+ COMMAND "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_install.cmake" -DCOMPONENT=ParallelSTL)
|