From af1916a2f92f4cb2729a4409e9f7a8ca181000f3 Mon Sep 17 00:00:00 2001 From: Freddy Paul Date: Thu, 16 Jul 2020 14:59:18 -0700 Subject: [PATCH] Enable STATIC LINKING of COMGR COMGR_DYN_DLL is used by rocclr to load COMGR as dynamic library. Need to remove this flag while linking COMGR as static lib by ROCclr. Default option is set to link COMGR as dynamic library Change-Id: I5631a8c1d896bd4d7e5ecf5ef5fa4f631cd2244d [ROCm/clr commit: 00223c5697b065768c35659dc3053b6ace0b1cb4] --- projects/clr/opencl/CMakeLists.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index 9817653e1b..563c591bde 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/CMakeLists.txt @@ -27,20 +27,32 @@ endif() if(DEFINED USE_COMGR_LIBRARY) if(${USE_COMGR_LIBRARY} MATCHES "yes") set(USE_COMGR_LIBRARY ON) + if(DEFINED LINK_COMGR_STATIC) + if(${LINK_COMGR_STATIC} MATCHES "yes") + set(LINK_COMGR_STATIC ON) + elseif(${LINK_COMGR_STATIC} MATCHES "no") + set(LINK_COMGR_STATIC OFF) + endif() + endif() elseif(${USE_COMGR_LIBRARY} MATCHES "no") set(USE_COMGR_LIBRARY OFF) endif() endif() option(USE_COMGR_LIBRARY "Use comgr library" ON) +option(LINK_COMGR_STATIC "Link comgr static library" OFF) option(BUILD_TESTS "Enable building OpenCL tests" ON) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) +MESSAGE(STATUS "LINK_COMGR_STATIC :${LINK_COMGR_STATIC}") if(USE_COMGR_LIBRARY) - add_definitions(-DUSE_COMGR_LIBRARY -DCOMGR_DYN_DLL) + add_definitions(-DUSE_COMGR_LIBRARY) + if(NOT LINK_COMGR_STATIC) + add_definitions(-DCOMGR_DYN_DLL) + endif() find_package(amd_comgr REQUIRED CONFIG PATHS /opt/rocm/