Skip to content

Commit 489ef56

Browse files
authored
Merge pull request #226 from lawruble13/provides-hotfix
Cherry-pick PROVIDES field fixes for header-only components
2 parents e494a50 + 5c11142 commit 489ef56

File tree

1 file changed

+23
-8
lines changed

1 file changed

+23
-8
lines changed

share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,29 @@ macro(rocm_create_package)
336336
)
337337
endif()
338338
if(PARSE_HEADER_ONLY OR NOT BUILD_SHARED_LIBS)
339-
rocm_join_if_set(", "
340-
CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
341-
CPACK_DEBIAN_PACKAGE_PROVIDES
342-
"${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
343-
rocm_join_if_set(", "
344-
CPACK_RPM_DEVEL_PACKAGE_PROVIDES
345-
CPACK_DEBIAN_PACKAGE_PROVIDES
346-
"${CPACK_PACKAGE_NAME} = ${CPACK_PACKAGE_VERSION}")
339+
if(DEFINED CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES)
340+
rocm_join_if_set(", "
341+
CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
342+
"${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})"
343+
)
344+
else()
345+
rocm_join_if_set(", "
346+
CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
347+
"${CPACK_DEBIAN_PACKAGE_PROVIDES}"
348+
"${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
349+
endif()
350+
351+
if(DEFINED CPACK_RPM_DEVEL_PACKAGE_PROVIDES)
352+
rocm_join_if_set(", "
353+
CPACK_RPM_DEVEL_PACKAGE_PROVIDES
354+
"${CPACK_PACKAGE_NAME}"
355+
)
356+
else()
357+
rocm_join_if_set(", "
358+
CPACK_RPM_DEVEL_PACKAGE_PROVIDES
359+
"${CPACK_RPM_PACKAGE_PROVIDES}"
360+
"${CPACK_PACKAGE_NAME}")
361+
endif()
347362
else()
348363
rocm_package_add_dependencies(COMPONENT devel DEPENDS "${CPACK_PACKAGE_NAME} >= ${CPACK_PACKAGE_VERSION}")
349364
endif()

0 commit comments

Comments
 (0)