Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop linking Vulkan directly #2000

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})

include_directories (${CLConform_INCLUDE_DIR})

# needed by Vulkan wrapper to link
if(WIN32)
list(APPEND CLConform_LIBRARIES vulkan-1 vulkan_wrapper)
else(WIN32)
list(APPEND CLConform_LIBRARIES vulkan dl vulkan_wrapper)
endif(WIN32)
list(APPEND CLConform_LIBRARIES vulkan_wrapper)
set(CMAKE_CXX_FLAGS "-fpermissive")

include_directories("../../common/vulkan_wrapper")
Expand Down
6 changes: 1 addition & 5 deletions test_conformance/vulkan/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
set (MODULE_NAME VULKAN)

if(WIN32)
list(APPEND CLConform_LIBRARIES vulkan-1 vulkan_wrapper)
else(WIN32)
list(APPEND CLConform_LIBRARIES vulkan dl vulkan_wrapper)
endif(WIN32)
list(APPEND CLConform_LIBRARIES vulkan_wrapper)
set(CMAKE_CXX_FLAGS "-fpermissive")
if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_WIN32_KHR")
Expand Down
Loading