From 0d7cb97435affe7f793835fd1166719dd3da712b Mon Sep 17 00:00:00 2001 From: jatang Date: Fri, 24 Feb 2023 15:51:52 -0500 Subject: [PATCH] SWDEV-385312 - Move install path of rocm-ocltst to /opt/rocm/share/ocltst Change-Id: Ic2d88b4b41a2bd8d08ffa0fcb72226e993c23a6d [ROCm/clr commit: b6bbcd8457e69bb11675b11f6f24e0eeca341e3e] --- projects/clr/opencl/tests/ocltst/CMakeLists.txt | 6 ++++++ projects/clr/opencl/tests/ocltst/env/CMakeLists.txt | 2 +- projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt | 4 ++-- projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt | 4 ++-- .../clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/projects/clr/opencl/tests/ocltst/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/CMakeLists.txt index eafbf96946..2938820e1e 100644 --- a/projects/clr/opencl/tests/ocltst/CMakeLists.txt +++ b/projects/clr/opencl/tests/ocltst/CMakeLists.txt @@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 3.5.1) set(OCLTST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +if (WIN32) + set(OCLTST_INSTALL_DIR "tests/ocltst") +else() + set(OCLTST_INSTALL_DIR "share/ocltst") +endif() + find_package(OpenGL) find_package(GLEW) diff --git a/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt index 871525e782..308acc7d6c 100644 --- a/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt +++ b/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt @@ -41,5 +41,5 @@ target_link_libraries(ocltst set_target_properties(ocltst PROPERTIES INSTALL_RPATH "$ORIGIN") -INSTALL(TARGETS ocltst DESTINATION tests/ocltst COMPONENT ocltst) +INSTALL(TARGETS ocltst DESTINATION ${OCLTST_INSTALL_DIR} COMPONENT ocltst) diff --git a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt index aa9559e3c9..6008f1be2b 100644 --- a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt +++ b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt @@ -68,6 +68,6 @@ foreach(TEST ${TESTS}) USES_TERMINAL) endforeach() -INSTALL(TARGETS oclgl DESTINATION tests/ocltst COMPONENT ocltst) -INSTALL(FILES oclgl.exclude DESTINATION tests/ocltst COMPONENT ocltst) +INSTALL(TARGETS oclgl DESTINATION ${OCLTST_INSTALL_DIR} COMPONENT ocltst) +INSTALL(FILES oclgl.exclude DESTINATION ${OCLTST_INSTALL_DIR} COMPONENT ocltst) diff --git a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt index dd4c163271..cbe49a5f63 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt +++ b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt @@ -133,6 +133,6 @@ foreach(TEST ${TESTS}) USES_TERMINAL) endforeach() -INSTALL(TARGETS oclperf DESTINATION tests/ocltst COMPONENT ocltst) -INSTALL(FILES oclperf.exclude DESTINATION tests/ocltst COMPONENT ocltst) +INSTALL(TARGETS oclperf DESTINATION ${OCLTST_INSTALL_DIR} COMPONENT ocltst) +INSTALL(FILES oclperf.exclude DESTINATION ${OCLTST_INSTALL_DIR} COMPONENT ocltst) diff --git a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt index 3314430421..0b5de94176 100644 --- a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt +++ b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt @@ -100,6 +100,6 @@ foreach(TEST ${TESTS}) USES_TERMINAL) endforeach() -INSTALL(TARGETS oclruntime DESTINATION tests/ocltst COMPONENT ocltst) -INSTALL(FILES oclruntime.exclude DESTINATION tests/ocltst COMPONENT ocltst) +INSTALL(TARGETS oclruntime DESTINATION ${OCLTST_INSTALL_DIR} COMPONENT ocltst) +INSTALL(FILES oclruntime.exclude DESTINATION ${OCLTST_INSTALL_DIR} COMPONENT ocltst)