SWDEV-340919 - Move examples and tests install dir
Previous install locations:
- /opt/rocm/share/example/amd-smi
- /opt/rocm/share/tests/amd-smi
New install locations:
- /opt/rocm/share/amd_smi/example
- /opt/rocm/share/amd_smi/tests
Change-Id: I305477b9f66bdc5963923efe6da1c01f87ea2085
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>
[ROCm/amdsmi commit: 6ee793ca03]
このコミットが含まれているのは:
@@ -55,6 +55,8 @@ include(GNUInstallDirs)
|
||||
option(BUILD_TESTS "Build test suite" OFF)
|
||||
option(ENABLE_LDCONFIG "Set library links and caches using ldconfig." ON)
|
||||
|
||||
# Set share path here because project name != amd_smi
|
||||
set(SHARE_INSTALL_PREFIX "share/${AMD_SMI}" CACHE STRING "Tests and Example install directory")
|
||||
# Packaging directives
|
||||
set(CPACK_PACKAGE_NAME
|
||||
${AMD_SMI_PACKAGE}
|
||||
@@ -212,6 +214,7 @@ install(
|
||||
|
||||
#License file
|
||||
set(CPACK_RPM_PACKAGE_LICENSE "NCSA")
|
||||
# docs are installed into different share directory from tests and examples
|
||||
install(
|
||||
FILES ${CPACK_RESOURCE_FILE_LICENSE}
|
||||
DESTINATION share/doc/${AMD_SMI}
|
||||
|
||||
@@ -14,13 +14,15 @@ function(generic_add_rocm)
|
||||
|
||||
set(CMAKE_INSTALL_PREFIX ${ROCM_DIR} CACHE STRING "Default installation directory.")
|
||||
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Default packaging prefix.")
|
||||
set(SHARE_INSTALL_PREFIX "share/${CMAKE_PROJECT_NAME}" CACHE STRING "Tests and Example install directory")
|
||||
# add package search paths
|
||||
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/local PARENT_SCOPE)
|
||||
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/lib64 /usr/lib/x86_64-linux-gnu PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
function(generic_package)
|
||||
# Used by test and example CMakeLists
|
||||
set(SHARE_INSTALL_PREFIX "share/${CMAKE_PROJECT_NAME}" CACHE STRING "Tests and Example install directory")
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.4.0)
|
||||
message("Compiler version is " ${CMAKE_CXX_COMPILER_VERSION})
|
||||
message(FATAL_ERROR "Require at least gcc-5.4.0")
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
# copy .cc files into install directory
|
||||
install(
|
||||
DIRECTORY ./
|
||||
DESTINATION share/example/amd-smi
|
||||
DESTINATION ${SHARE_INSTALL_PREFIX}/example
|
||||
FILES_MATCHING
|
||||
PATTERN "*.cc")
|
||||
|
||||
@@ -12,7 +12,7 @@ install(
|
||||
install(
|
||||
FILES CMakeLists.txt.in
|
||||
RENAME CMakeLists.txt
|
||||
DESTINATION share/example/amd-smi)
|
||||
DESTINATION ${SHARE_INSTALL_PREFIX}/example)
|
||||
|
||||
# compile example files but do not install
|
||||
# this is only useful if running from build directory
|
||||
|
||||
@@ -68,5 +68,5 @@ target_link_libraries(${TEST} amd_smi c stdc++ pthread GTest::gtest_main)
|
||||
# TODO: Remove GTest from here in the future and rely on INSTALL_GTEST?
|
||||
install(
|
||||
TARGETS ${TEST} gtest gtest_main
|
||||
DESTINATION ${SHARE_INSTALL_PREFIX}/tests/amd_smi
|
||||
DESTINATION ${SHARE_INSTALL_PREFIX}/tests
|
||||
COMPONENT tests)
|
||||
|
||||
@@ -60,5 +60,5 @@ target_link_libraries(${TEST} rocm_smi64 c stdc++ pthread GTest::gtest_main)
|
||||
|
||||
#install(
|
||||
# TARGETS ${TEST}
|
||||
# DESTINATION ${SHARE_INSTALL_PREFIX}/tests/amd_smi
|
||||
# DESTINATION ${SHARE_INSTALL_PREFIX}/tests
|
||||
# COMPONENT tests)
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする