Skip to content

Commit eab4ba1

Browse files
committed
Address review comments:
- Remove HIP_VERSION_MAJOR/MINOR/PATCH - Make hipcc package depend on hip-dev, rocm-llvm
1 parent 785c225 commit eab4ba1

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

amd/hipcc/CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
1818
set(ADDITIONAL_SHARED_LIBRARIES_TO_LINK
1919
libstdc++fs.so)
2020

21-
get_directory_property(HAS_PARENT_SCOPE PARENT_DIRECTORY)
22-
if(HAS_PARENT_SCOPE)
23-
# FIXME(kzhuravl): Do we need these here? If yes, what is the default?
24-
set(HIP_VERSION_MAJOR 4 PARENT_SCOPE)
25-
set(HIP_VERSION_MINOR 4 PARENT_SCOPE)
26-
set(HIP_VERSION_PATCH 4 PARENT_SCOPE)
27-
else()
28-
message(STATUS "Current scope has no parent")
29-
endif()
30-
3121
set(HIPCC_BIN
3222
hipcc.bin)
3323
set(HIPCC_SOURCES
@@ -65,7 +55,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
6555

6656
# Debian-specific packaging variables.
6757
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
68-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libfile-basedir-perl, libfile-copy-recursive-perl, libfile-listing-perl, libfile-which-perl, liburi-encode-perl, perl (>= 5.0)")
58+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-dev, libfile-basedir-perl, libfile-copy-recursive-perl, libfile-listing-perl, libfile-which-perl, liburi-encode-perl, perl (>= 5.0), rocm-llvm")
6959
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm-Developer-Tools/HIPCC")
7060
if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
7161
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
@@ -76,7 +66,7 @@ endif()
7666
# RPM-specific packaging variables.
7767
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
7868
set(CPACK_RPM_PACKAGE_LICENSE "NCSA")
79-
set(CPACK_RPM_PACKAGE_REQUIRES "perl >= 5.0, perl-File-BaseDir, perl-File-Listing, perl-File-Which, perl-URI-Encode")
69+
set(CPACK_RPM_PACKAGE_REQUIRES "hip-dev, perl >= 5.0, perl-File-BaseDir, perl-File-Listing, perl-File-Which, perl-URI-Encode, rocm-llvm")
8070
if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
8171
set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
8272
else()

0 commit comments

Comments
 (0)