Skip to content

Commit fee971a

Browse files
committed
Add correct macro definition for static case
1 parent 3c527e3 commit fee971a

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

src/dawn/native/CMakeLists.txt

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ if (IOS)
888888
target_compile_options(dawn_native PRIVATE -fno-objc-arc)
889889
endif()
890890

891-
if (DAWN_BUILD_MONOLITHIC_LIBRARY)
891+
if (NOT DAWN_BUILD_MONOLITHIC_LIBRARY STREQUAL "OFF")
892892
###############################################################################
893893
# Do the 'complete_lib' build.
894894
# A convenience target that bundles dawn_native and procs calling it directly so that
@@ -911,14 +911,25 @@ if (DAWN_BUILD_MONOLITHIC_LIBRARY)
911911
${WEBGPU_DAWN_NATIVE_PROC_GEN_SOURCES}
912912
${dawn_component_srcs}
913913
)
914-
target_compile_definitions(webgpu_dawn
915-
PRIVATE
916-
"WGPU_IMPLEMENTATION"
917-
"DAWN_NATIVE_IMPLEMENTATION"
918-
PUBLIC
919-
"WGPU_SHARED_LIBRARY"
920-
"DAWN_NATIVE_SHARED_LIBRARY"
921-
)
914+
if(${DAWN_BUILD_MONOLITHIC_LIBRARY} MATCHES "SHARED")
915+
target_compile_definitions(webgpu_dawn
916+
PRIVATE
917+
"WGPU_IMPLEMENTATION"
918+
"DAWN_NATIVE_IMPLEMENTATION"
919+
PUBLIC
920+
"WGPU_SHARED_LIBRARY"
921+
"DAWN_NATIVE_SHARED_LIBRARY"
922+
)
923+
elif(${DAWN_BUILD_MONOLITHIC_LIBRARY} MATCHES "STATIC")
924+
target_compile_definitions(webgpu_dawn
925+
PRIVATE
926+
"WGPU_IMPLEMENTATION"
927+
"DAWN_NATIVE_IMPLEMENTATION"
928+
PUBLIC
929+
"WGPU_STATIC_LIBRARY" # Here it's simply important that we do not define WGPU_SHARED_LIBRARY, as this will set dllimport / export attributes on windows.
930+
"DAWN_NATIVE_STATIC_LIBRARY"
931+
)
932+
endif()
922933
# Apart from dawn_public_config, everything else goes inside PRIVATE, otherwise install rules will complain that they were not exported.
923934
target_link_libraries(webgpu_dawn
924935
PUBLIC

0 commit comments

Comments
 (0)