Skip to content

Commit 1c2677f

Browse files
authored
[hipcc] Define Debian doc source path relative to utils.cmake (#623)
Using ${CMAKE_SOURCE_DIR}/DEBIAN for the directory in which amd/hipcc/utils.cmake expects e.g. copyright.in can break in some situations if hipcc is build with llvm as an external project because the path evaluates to llvm/DEBIAN instead of amd/hipcc/DEBIAN. Define the path relative to the utils.cmake path. Extract a variable for the build path for consistency.
2 parents 1f35e37 + a0b005f commit 1c2677f

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

amd/hipcc/utils.cmake

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ function( configure_pkg PACKAGE_NAME_T COMPONENT_NAME_T PACKAGE_VERSION_T MAINTA
77
set_debian_pkg_cmake_flags( ${PACKAGE_NAME_T} ${PACKAGE_VERSION_T}
88
${MAINTAINER_NM_T} ${MAINTAINER_EMAIL_T} )
99

10+
set(DEB_SOURCE_DIR "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/DEBIAN")
11+
set(DEB_BUILD_DIR "${CMAKE_BINARY_DIR}/DEBIAN")
1012
# Create debian directory in build tree
11-
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/DEBIAN")
13+
file(MAKE_DIRECTORY "${DEB_BUILD_DIR}")
1214

1315
# Configure the copyright file
1416
configure_file(
15-
"${CMAKE_SOURCE_DIR}/DEBIAN/copyright.in"
16-
"${CMAKE_BINARY_DIR}/DEBIAN/copyright"
17+
"${DEB_SOURCE_DIR}/copyright.in"
18+
"${DEB_BUILD_DIR}/copyright"
1719
@ONLY
1820
)
1921

@@ -24,25 +26,25 @@ function( configure_pkg PACKAGE_NAME_T COMPONENT_NAME_T PACKAGE_VERSION_T MAINTA
2426

2527
# Configure the changelog file
2628
configure_file(
27-
"${CMAKE_SOURCE_DIR}/DEBIAN/changelog.in"
28-
"${CMAKE_BINARY_DIR}/DEBIAN/changelog.Debian"
29+
"${DEB_SOURCE_DIR}/changelog.in"
30+
"${DEB_BUILD_DIR}/changelog.Debian"
2931
@ONLY
3032
)
3133

3234
# Install Change Log
3335
find_program ( DEB_GZIP_EXEC gzip )
34-
if(EXISTS "${CMAKE_BINARY_DIR}/DEBIAN/changelog.Debian" )
36+
if(EXISTS "${DEB_BUILD_DIR}/changelog.Debian" )
3537
execute_process(
36-
COMMAND ${DEB_GZIP_EXEC} -f -n -9 "${CMAKE_BINARY_DIR}/DEBIAN/changelog.Debian"
37-
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/DEBIAN"
38+
COMMAND ${DEB_GZIP_EXEC} -f -n -9 "${DEB_BUILD_DIR}/changelog.Debian"
39+
WORKING_DIRECTORY "${DEB_BUILD_DIR}"
3840
RESULT_VARIABLE result
3941
OUTPUT_VARIABLE output
4042
ERROR_VARIABLE error
4143
)
4244
if(NOT ${result} EQUAL 0)
4345
message(FATAL_ERROR "Failed to compress: ${error}")
4446
endif()
45-
install ( FILES "${CMAKE_BINARY_DIR}/DEBIAN/${DEB_CHANGELOG_INSTALL_FILENM}"
47+
install ( FILES "${DEB_BUILD_DIR}/${DEB_CHANGELOG_INSTALL_FILENM}"
4648
DESTINATION ${CMAKE_INSTALL_DOCDIR}
4749
COMPONENT ${COMPONENT_NAME_T})
4850
endif()

0 commit comments

Comments
 (0)