ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop linking Vulkan directly (#2000)

Browse Source 
The `vulkan-wrapper` helper library's purpose is to eliminate the need
to link targets directly to Vulkan, and load it dynamically instead at
runtime, using `dlopen` and `LoadLibrary`.

Remove the direct linking of the Vulkan library from targets that link
to `vulkan-wrapper`.

Fixes #1999

Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This commit is contained in:
Ahmed Hesham
2024-07-09 17:57:39 +01:00
committed by GitHub
parent dd029cab8f
commit 47546a5c4c
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test_conformance/extensions/cl_khr_external_semaphore/CMakeLists.txt
View File

@@ -15,12 +15,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories (${CLConform_INCLUDE_DIR}) include_directories (${CLConform_INCLUDE_DIR})
# needed by Vulkan wrapper to link list(APPEND CLConform_LIBRARIES vulkan_wrapper)
if(WIN32)
list(APPEND CLConform_LIBRARIES vulkan-1 vulkan_wrapper)
else(WIN32)
list(APPEND CLConform_LIBRARIES vulkan dl vulkan_wrapper)
endif(WIN32)
set(CMAKE_CXX_FLAGS "-fpermissive") set(CMAKE_CXX_FLAGS "-fpermissive")
include_directories("../../common/vulkan_wrapper") include_directories("../../common/vulkan_wrapper")

6
test_conformance/vulkan/CMakeLists.txt
View File

@@ -1,10 +1,6 @@
set (MODULE_NAME VULKAN) set (MODULE_NAME VULKAN)
if(WIN32) list(APPEND CLConform_LIBRARIES vulkan_wrapper)
list(APPEND CLConform_LIBRARIES vulkan-1 vulkan_wrapper)
else(WIN32)
list(APPEND CLConform_LIBRARIES vulkan dl vulkan_wrapper)
endif(WIN32)
set(CMAKE_CXX_FLAGS "-fpermissive") set(CMAKE_CXX_FLAGS "-fpermissive")
if(WIN32) if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_WIN32_KHR") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_WIN32_KHR")