From 4eaab600cff7be5bcd9ea66c5b115bbc6f39bdf6 Mon Sep 17 00:00:00 2001
From: Artur Wojcik <artur.wojcik@amd.com>
Date: Thu, 31 Aug 2023 23:41:11 +0200
Subject: [PATCH] cmake: use imported target for threads library instead of
 variable

---
 CMakeLists.txt        | 1 +
 driver/CMakeLists.txt | 5 +----
 src/CMakeLists.txt    | 2 +-
 test/CMakeLists.txt   | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d95378708..31a5e29538 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ project ( MIOpen C CXX )
 
 enable_testing()
 
+find_package(Threads REQUIRED)
 find_package(ROCM 0.7.3 REQUIRED PATHS /opt/rocm)
 
 include(ROCMInstallTargets)
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
index 2918a5aa94..8aeae9c078 100644
--- a/driver/CMakeLists.txt
+++ b/driver/CMakeLists.txt
@@ -25,11 +25,8 @@
 ################################################################################
 cmake_minimum_required( VERSION 3.5)
 
-find_package(Threads REQUIRED)
-
 add_executable(MIOpenDriver main.cpp InputFlags.cpp)
-target_link_libraries(MIOpenDriver MIOpen)
-target_link_libraries(MIOpenDriver ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(MIOpenDriver MIOpen Threads::Threads)
 if(NOT MIOPEN_EMBED_DB STREQUAL "")
 target_link_libraries(MIOpenDriver $<BUILD_INTERFACE:miopen_data> )
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c0bc457b93..05f38bf8f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -692,7 +692,7 @@ target_include_directories(MIOpen SYSTEM PUBLIC $<BUILD_INTERFACE:${HALF_INCLUDE
 target_include_directories(MIOpen SYSTEM PRIVATE ${BZIP2_INCLUDE_DIR})
 # Workaround : change in rocm-cmake was causing linking error so had to add ${CMAKE_DL_LIBS} 
 #               We can remove ${CMAKE_DL_LIBS} once root cause is identified.
-target_link_libraries(MIOpen PRIVATE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${BZIP2_LIBRARIES} ${MIOPEN_CK_LINK_FLAGS})
+target_link_libraries(MIOpen PRIVATE ${CMAKE_DL_LIBS} Threads::Threads ${BZIP2_LIBRARIES} ${MIOPEN_CK_LINK_FLAGS})
 generate_export_header(MIOpen
     EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/miopen/export.h
 )
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 70b74fc17b..9b95c62083 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -182,7 +182,6 @@ else()
     add_definitions(-DMIOPEN_TEST_DRIVER_MODE=1)
 endif()
 
-find_package(Threads REQUIRED)
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C ${CMAKE_CFG_INTDIR})
 add_custom_target(tests)
 
@@ -335,7 +334,7 @@ separate_arguments(MIOPEN_TEST_FLAGS_ARGS UNIX_COMMAND ${MIOPEN_TEST_FLAGS})
 function(add_test_executable TEST_NAME)
     add_executable (${TEST_NAME} EXCLUDE_FROM_ALL ${ARGN})
     clang_tidy_check(${TEST_NAME})
-    target_link_libraries(${TEST_NAME} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(${TEST_NAME} Threads::Threads)
     # Cmake does not add flags correctly for gcc
     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         set_target_properties(${TEST_NAME} PROPERTIES COMPILE_FLAGS -pthread LINK_FLAGS -pthread)