From 2915d521a1d6dc473a4f4fa7806d8c829dd7fd2e Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Tue, 1 May 2018 15:13:58 -0400 Subject: [PATCH] Remove redundant dev package build No need to build the package in the build-dev target. This is taken care of by package-dev. Removing the redundant packaging command allows install-dev to work without building a package unnecessarily. Also moved the rm command into the package-dev target. Change-Id: I044871be03ebc5673146b44e4291b48b112f4440 Signed-off-by: Felix Kuehling --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c91f342ba6..7f0781b0c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,13 +127,14 @@ add_custom_target ( build-dev -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" -DCPACK_RPM_PACKAGE_REQUIRES="hsakmt-roct" -DCPACK_PACKAGING_INSTALL_PREFIX="${CPACK_PACKAGING_INSTALL_PREFIX}" - COMMAND rm -rf *.deb *.rpm *.tar.gz - COMMAND make package WORKING_DIRECTORY ${DEV_BUILD_DIR} ) ## Custom targets for the devel package add_custom_target ( install-dev DEPENDS build-dev COMMAND make install WORKING_DIRECTORY ${DEV_BUILD_DIR} ) -add_custom_target ( package-dev DEPENDS build-dev COMMAND make package WORKING_DIRECTORY ${DEV_BUILD_DIR} ) +add_custom_target ( package-dev DEPENDS build-dev + COMMAND rm -rf *.deb *.rpm *.tar.gz + COMMAND make package + WORKING_DIRECTORY ${DEV_BUILD_DIR} ) ## Add the install directives for the runtime library. install ( TARGETS ${HSAKMT_TARGET} LIBRARY DESTINATION libhsakmt/lib COMPONENT ${HSAKMT_COMPONENT} )