From 43b6294afbd5d48fa49e54aab2a5f7880452d797 Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Wed, 2 Jun 2021 20:59:35 -0400 Subject: [PATCH] SWDEV-273235 - Do not use target_link_options() Some CI systems have a somewhat out of date version of cmake, which does not have this functionality. Fall back to using target_link_libraries() instead. Change-Id: I2410b24bcb6f1be2c2c3303ccd0019b10c914d2e [ROCm/clr commit: 58c93c8047f05ba5581bc17bc22c2abee67412a9] --- projects/clr/opencl/amdocl/CMakeLists.txt | 2 +- projects/clr/opencl/tools/cltrace/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/clr/opencl/amdocl/CMakeLists.txt b/projects/clr/opencl/amdocl/CMakeLists.txt index ee7270d38b..a9cb826f04 100644 --- a/projects/clr/opencl/amdocl/CMakeLists.txt +++ b/projects/clr/opencl/amdocl/CMakeLists.txt @@ -97,7 +97,7 @@ if(BUILD_SHARED_LIBS) if(WIN32) target_sources(amdocl PRIVATE amdocl.def) else() - target_link_options(amdocl PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/amdocl.map") + target_link_libraries(amdocl PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/amdocl.map") set_target_properties(amdocl PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/amdocl.map") endif() endif() diff --git a/projects/clr/opencl/tools/cltrace/CMakeLists.txt b/projects/clr/opencl/tools/cltrace/CMakeLists.txt index b8a432dcd3..d0337a5b1a 100644 --- a/projects/clr/opencl/tools/cltrace/CMakeLists.txt +++ b/projects/clr/opencl/tools/cltrace/CMakeLists.txt @@ -3,11 +3,11 @@ add_library(cltrace SHARED cltrace.cpp) if(WIN32) target_sources(cltrace PRIVATE cltrace.def) else() - target_link_options(cltrace PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/cltrace.map") + target_link_libraries(cltrace PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/cltrace.map") set_target_properties(cltrace PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/cltrace.map") endif() -target_link_libraries(cltrace OpenCL amdocl) +target_link_libraries(cltrace PRIVATE OpenCL amdocl) INSTALL(TARGETS cltrace RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}