From 5943e4d93ea3d1a70338c6c436deec00c0f55bad Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Fri, 24 Apr 2020 14:41:03 -0400 Subject: [PATCH] Don't use intermediate object library This added an unnecessary level of indirection, and also didn't automatically pull in interface dependencies from the linked targets. Change-Id: I7371ab3c184f6045947a96c8a393f2e3452fc5c1 --- opencl/amdocl/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/opencl/amdocl/CMakeLists.txt b/opencl/amdocl/CMakeLists.txt index 9aa8b083d1..e9a1a1fad6 100644 --- a/opencl/amdocl/CMakeLists.txt +++ b/opencl/amdocl/CMakeLists.txt @@ -22,6 +22,9 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$") add_definitions(-DDEBUG) endif() +# FIXME: Use find_package +include(${LIBVDI_STATIC_DIR}/amdvdi_staticTargets.cmake) + include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/khronos) include_directories(${CMAKE_SOURCE_DIR}/khronos/headers) @@ -58,7 +61,7 @@ else() set(ADDITIONAL_LIBRARIES "") endif() -add_library(amdocl64_obj OBJECT +set(amdocl64_src cl_memobj.cpp cl_program.cpp cl_sdi_amd.cpp @@ -86,14 +89,9 @@ add_library(amdocl64_obj OBJECT ${ADDITIONAL_LIBRARIES} ) -add_library(amdocl64 SHARED - $ -) +add_library(amdocl64 SHARED ${amdocl64_src}) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -include(${LIBVDI_STATIC_DIR}/amdvdi_staticTargets.cmake) - target_link_libraries(amdocl64 amdvdi_static Threads::Threads dl) -