From 87f62056f1b613e4e017ebe2480bb3d2d478573e Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 26 Apr 2020 18:17:32 -0400 Subject: [PATCH] kfdtest: Move the package definitions to the beginning in CMakeLists.txt This ensures that similiar logic stays together. Signed-off-by: Yong Zhao Change-Id: I32695d7d6a7366bcbf4169e22119d768d111c633 --- tests/kfdtest/CMakeLists.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/kfdtest/CMakeLists.txt b/tests/kfdtest/CMakeLists.txt index d92a6154ad..06eb821b17 100644 --- a/tests/kfdtest/CMakeLists.txt +++ b/tests/kfdtest/CMakeLists.txt @@ -38,6 +38,16 @@ set ( CPACK_PACKAGE_VERSION_MINOR "0" ) set ( CPACK_PACKAGE_VERSION_PATCH "0" ) set ( CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" ) +## Define default variable and variables for the optional build target hsakmt-dev +set ( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Location of hsakmt source code." ) +set ( CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory." ) +set ( CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Default packaging prefix." ) +set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators." ) + +# Debian package specific variables +set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" ) + + #set ( CMAKE_VERBOSE_MAKEFILE on ) find_package(PkgConfig) @@ -57,15 +67,6 @@ else() include_directories(${DRM_AMDGPU_INCLUDE_DIRS}) endif() -## Define default variable and variables for the optional build target hsakmt-dev -set ( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Location of hsakmt source code." ) -set ( CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory." ) -set ( CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Default packaging prefix." ) -set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators." ) - -# Debian package specific variables -set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" ) - if( DEFINED ENV{LIBHSAKMT_PATH} ) set ( LIBHSAKMT_PATH $ENV{LIBHSAKMT_PATH} ) message ( "LIBHSAKMT_PATH environment variable is set" )