Skip to content

Commit 30f7594

Browse files
committed
build path for msvc find library
1 parent 2360ba9 commit 30f7594

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

cmake/gpu.cmake

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
66
else()
77
get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
88
get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
9-
109
set(PROJECT_ROOT "${PROJECT_ROOT}/")
1110
endif()
1211

@@ -21,7 +20,6 @@ set(DAWN_INSTALL_PREFIX "${FETCHCONTENT_BASE_DIR}/dawn-build/out/${CMAKE_BUILD_T
2120

2221
# Before fetching, set configuration options for Dawn.
2322
set(DCMAKE_INSTALL_PREFIX ${DAWN_INSTALL_PREFIX} CACHE INTERNAL "Dawn install location" FORCE)
24-
set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE INTERNAL "Dawn configuration types" FORCE)
2523

2624
# Dawn options for more,
2725
# see https://dawn.googlesource.com/dawn/+/refs/heads/main/CMakeLists.txt
@@ -98,11 +96,18 @@ add_library(gpu STATIC ${GPU_SOURCES} ${GPU_HEADERS})
9896
target_include_directories(gpu PUBLIC "${PROJECT_ROOT}")
9997
target_include_directories(gpu PUBLIC "${PROJECT_ROOT}/third_party/headers")
10098

101-
# Find the monolithic library for Dawn
102-
find_library(WEBGPU_DAWN_MONOLITHIC
99+
# find_library, windows adds extra folder
100+
if(MSVC)
101+
find_library(WEBGPU_DAWN_MONOLITHIC
103102
NAMES webgpu_dawn
104-
HINTS "${DAWN_INSTALL_PREFIX}/src/dawn/native/${CMAKE_BUILD_TYPE}"
105-
)
103+
PATHS "${DAWN_INSTALL_PREFIX}/src/dawn/native/${CMAKE_BUILD_TYPE}"
104+
)
105+
else()
106+
find_library(WEBGPU_DAWN_MONOLITHIC
107+
NAMES webgpu_dawn
108+
PATHS "${DAWN_INSTALL_PREFIX}/src/dawn/native"
109+
)
110+
endif()
106111

107112
# Link the monolithic library
108113
target_link_libraries(gpu PRIVATE ${WEBGPU_DAWN_MONOLITHIC})

0 commit comments

Comments
 (0)