From 6efc01f11c5c4503947f2172ae61bbaf68058815 Mon Sep 17 00:00:00 2001 From: Lauren Wrubleski Date: Thu, 18 Jul 2024 22:15:19 -0600 Subject: [PATCH 1/2] Correct CMake for TBB dependency --- library/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index bddc00a26..e440436e3 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -130,9 +130,9 @@ if(NOT WIN32 AND ROCRAND_USE_TBB) message(WARNING "TBB is not found. Building without parallel STL support") else() target_link_libraries(rocrand PRIVATE TBB::tbb) - rocm_package_add_deb_dependencies("libtbb-dev") - set(CPACK_DEB_PACKAGE_REQUIRES "${CPACK_DEB_PACKAGE_REQUIRES}" PARENT_SCOPE) - rocm_package_add_rpm_dependencies("(tbb-devel or tbb)") + rocm_package_add_deb_dependencies(DEPENDS "libtbb-dev") + set(CPACK_DEBIAN_PACKAGE_DEPENDSS "${CPACK_DEBIAN_PACKAGE_DEPENDSS}" PARENT_SCOPE) + rocm_package_add_rpm_dependencies(DEPENDS "(tbb-devel or tbb)") set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}" PARENT_SCOPE) # Older libstdc++ headers require TBB to be installed to be able to #include From d6fae3e4a80e9762bd56c3797698d9c14244a58b Mon Sep 17 00:00:00 2001 From: Lauren Wrubleski Date: Fri, 19 Jul 2024 08:48:01 -0600 Subject: [PATCH 2/2] Fix typo --- library/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index e440436e3..fba119333 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -131,7 +131,7 @@ if(NOT WIN32 AND ROCRAND_USE_TBB) else() target_link_libraries(rocrand PRIVATE TBB::tbb) rocm_package_add_deb_dependencies(DEPENDS "libtbb-dev") - set(CPACK_DEBIAN_PACKAGE_DEPENDSS "${CPACK_DEBIAN_PACKAGE_DEPENDSS}" PARENT_SCOPE) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}" PARENT_SCOPE) rocm_package_add_rpm_dependencies(DEPENDS "(tbb-devel or tbb)") set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}" PARENT_SCOPE)