From b7789d46995ef2832b6771e371d8601f53e396d6 Mon Sep 17 00:00:00 2001 From: Adam Pryor Date: Fri, 15 Nov 2024 10:51:37 -0500 Subject: [PATCH] Revert "[SWDEV-446215] Update cmake to put test libs in proper lib dir" This reverts commit 6e01df00ca3b6cb1f4bc156529dfd9ecd0d078de. Reason for revert: Because the gtest of amdsmi is different to other components so it was installed in a share/amdsmi/lib folder. It cannot be installed in a common folder such as /usr/local/bin or /usr/bin because all other components try to search those folder first. This is breaking ROCmValidationSuite and other tools. Per Wang, Yanyao this should be reverted. Change-Id: Id61bc6056fe41800e738616f39293e9b8762a377 --- tests/amd_smi_test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/amd_smi_test/CMakeLists.txt b/tests/amd_smi_test/CMakeLists.txt index c80b7648dc..6433986a9a 100644 --- a/tests/amd_smi_test/CMakeLists.txt +++ b/tests/amd_smi_test/CMakeLists.txt @@ -4,7 +4,7 @@ option(INSTALL_GTEST "Install GTest (only useful if GTest is not already install # Help tests find libraries at runtime set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-new-dtags") set(CMAKE_INSTALL_RPATH - "\$ORIGIN:\$ORIGIN/../../../lib:CPACK_PACKAGING_INSTALL_PREFIX/lib" + "\$ORIGIN:\$ORIGIN/../../../lib" CACHE STRING "RUNPATH for tests. Helps find libgtest.so and libamd_smi.so") # Download and compile googletest @@ -76,6 +76,6 @@ install( # Install googletest libraries with tests install(TARGETS gtest gtest_main - DESTINATION ${CPACK_PACKAGING_INSTALL_PREFIX}/lib + DESTINATION ${SHARE_INSTALL_PREFIX}/tests COMPONENT ${TESTS_COMPONENT})