Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-11-18 03:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch back to linking against shared library version of wgpu_native

Browse Source
This commit is contained in:
Sebastian Emanuel Dawid 2025-11-12 16:31:08 +01:00
parent c8c7405f37
commit db5fc21072
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
examples/CMakeLists.txt
View File

@ -25,7 +25,6 @@ set(GETOPT "${GLFW_SOURCE_DIR}/deps/getopt.h"
set(TINYCTHREAD "${GLFW_SOURCE_DIR}/deps/tinycthread.h" set(TINYCTHREAD "${GLFW_SOURCE_DIR}/deps/tinycthread.h"
"${GLFW_SOURCE_DIR}/deps/tinycthread.c") "${GLFW_SOURCE_DIR}/deps/tinycthread.c")
set(WEBGPU_MIRROR "https://github.com/gfx-rs/wgpu-native")
set(URL_ARCH) set(URL_ARCH)
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if (CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
if (CMAKE_SIZEOF_VOID_P EQUAL 8) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
@ -40,16 +39,17 @@ else ()
endif () endif ()
set(URL_OS) set(URL_OS)
set(WEBGPU_LIBNAME "libwgpu_native.a") set(WEBGPU_LIBNAME "libwgpu_native.so")
if (CMAKE_SYSTEM_NAME STREQUAL "Windows") if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(URL_OS "windows") set(URL_OS "windows")
set(WEBGPU_LIBNAME "wgpu_native.dll")
if (MSVC) if (MSVC)
set(WEBGPU_LIBNAME "wgpu_native.lib")
set(URL_ARCH "${URL_ARCH}-msvc") set(URL_ARCH "${URL_ARCH}-msvc")
else () else ()
set(URL_ARCH "${URL_ARCH}-gnu") set(URL_ARCH "${URL_ARCH}-gnu")
endif () endif ()
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin") elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(WEBGPU_LIBNAME "libwgpu_native.dylib")
set(URL_OS "macos") set(URL_OS "macos")
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(URL_OS "linux") set(URL_OS "linux")
@ -64,9 +64,10 @@ FetchContent_Declare(webgpu_bins
) )
FetchContent_MakeAvailable(webgpu_bins) FetchContent_MakeAvailable(webgpu_bins)
add_library(webgpu STATIC IMPORTED GLOBAL) add_library(webgpu SHARED IMPORTED GLOBAL)
set(WEBGPU_RUNTIME_LIB "${webgpu_bins_SOURCE_DIR}/lib/${WEBGPU_LIBNAME}")
set_target_properties(webgpu PROPERTIES set_target_properties(webgpu PROPERTIES
IMPORTED_LOCATION "${webgpu_bins_SOURCE_DIR}/lib/${WEBGPU_LIBNAME}" IMPORTED_LOCATION "${WEBGPU_RUNTIME_LIB}"
) )
target_include_directories(webgpu INTERFACE target_include_directories(webgpu INTERFACE
"${webgpu_bins_SOURCE_DIR}/include" "${webgpu_bins_SOURCE_DIR}/include"
@ -74,34 +75,28 @@ target_include_directories(webgpu INTERFACE
) )
if (CMAKE_SYSTEM_NAME STREQUAL "Windows") if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_link_libraries(webgpu INTERFACE set_target_properties(webgpu PROPERTIES
d3dcompiler.lib IMPORTED_IMPLIB ${webgpu_bins_SOURCE_DIR}/lib/${WEBGPU_LIBNAME}.lib
Ws2_32.lib
Userenv.lib
ntdll.lib
Bcrypt.lib
Opengl32.lib
Propsys.lib
RuntimeObject.lib
) )
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_link_libraries(webgpu INTERFACE dl pthread m) set_target_properties(webgpu PROPERTIES IMPORTED_NO_SONAME True)
else () # macOS else () # macOS
if (URL_ARCH STREQUAL "aarch64") if (URL_ARCH STREQUAL "aarch64")
set(URL_ARCH "x86_64") set(URL_ARCH "x86_64")
else () else ()
set(URL_ARCH "aarch64") set(URL_ARCH "aarch64")
endif () endif ()
set(WEBGPU_URL "https://github.com/gfx-rs/wgpu-native/releases/download/v24.0.3.1/wgpu-macos-${URL_ARCH}-release.zip") set(WEBGPU_URL "https://github.com/gfx-rs/wgpu-native/releases/download/v24.0.3.1/wgpu-macos-${URL_ARCH}-release.zip")
include(FetchContent)
FetchContent_Declare(webgpu_other_bins FetchContent_Declare(webgpu_other_bins
URL ${WEBGPU_URL} URL ${WEBGPU_URL}
) )
FetchContent_MakeAvailable(webgpu_other_bins) FetchContent_MakeAvailable(webgpu_other_bins)
add_library(webgpu_other STATIC IMPORTED GLOBAL) add_library(webgpu_other STATIC IMPORTED GLOBAL)
set(WEBGPU_RUNTIME_LIB_OTHER "${webgpu_other_bins_SOURCE_DIR}/lib/${WEBGPU_LIBNAME}")
set_target_properties(webgpu_other PROPERTIES set_target_properties(webgpu_other PROPERTIES
IMPORTED_LOCATION "${webgpu_other_bins_SOURCE_DIR}/lib/${WEBGPU_LIBNAME}" IMPORTED_LOCATION "${WEBGPU_RUNTIME_LIB_OTHER}"
) )
target_include_directories(webgpu_other INTERFACE target_include_directories(webgpu_other INTERFACE
"${webgpu_other_bins_SOURCE_DIR}/include" "${webgpu_other_bins_SOURCE_DIR}/include"
@ -109,9 +104,6 @@ else () # macOS
) )
target_link_libraries(webgpu INTERFACE target_link_libraries(webgpu INTERFACE
"-framework Metal"
"-framework QuartzCore"
"-framework MetalKit"
webgpu_other webgpu_other
) )
endif () endif ()