From d3366b56aab7ead6d1a3845f5a12dafc6e0a6389 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Fri, 8 Aug 2025 23:19:48 +0300 Subject: [PATCH] Support version argument in find-wgpu-native script --- cmake/modules/Findwgpu-native.cmake | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cmake/modules/Findwgpu-native.cmake b/cmake/modules/Findwgpu-native.cmake index 517d3c06..c146786a 100644 --- a/cmake/modules/Findwgpu-native.cmake +++ b/cmake/modules/Findwgpu-native.cmake @@ -3,16 +3,27 @@ if(wgpu-native_FOUND) endif() # Don't search for include files - these are bundled with psemek-wgpu lib -find_library(wgpu-native_LIBRARIES NAMES libwgpu_native.a wgpu_native.dll wgpu_native PATHS "${WGPU_NATIVE_ROOT}") +find_library(wgpu-native_LIBRARY NAMES libwgpu_native.a wgpu_native.dll wgpu_native PATHS "${WGPU_NATIVE_ROOT}" "${WGPU_NATIVE_ROOT}/lib") +find_file(wgpu-native_VERSION_FILE wgpu-native-git-tag PATHS "${WGPU_NATIVE_ROOT}/wgpu-native-meta") + +if(EXISTS "${wgpu-native_VERSION_FILE}") + file(READ "${wgpu-native_VERSION_FILE}" wgpu-native_VERSION_NOT_STRIPPED) + string(STRIP "${wgpu-native_VERSION_NOT_STRIPPED}" wgpu-native_VERSION_STRIPPED) + string(SUBSTRING "${wgpu-native_VERSION_STRIPPED}" 1 -1 wgpu-native_VERSION) +endif() include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(wgpu-native DEFAULT_MSG wgpu-native_LIBRARIES) +find_package_handle_standard_args(wgpu-native + REQUIRED_VARS wgpu-native_LIBRARY wgpu-native_VERSION_FILE + VERSION_VAR wgpu-native_VERSION +) if(wgpu-native_FOUND AND NOT TARGET wgpu-native) + set(wgpu-native_LIBRARIES ${wgpu-native_LIBRARY}) add_library(wgpu-native STATIC IMPORTED) set_target_properties(wgpu-native PROPERTIES IMPORTED_LOCATION "${wgpu-native_LIBRARIES}" ) endif() -mark_as_advanced(wgpu-native_LIBRARIES) +mark_as_advanced(wgpu-native_LIBRARY wgpu-native_VERSION_FILE)