Skip to content

Commit dd74844

Browse files
committed
Fix MinGW import lib installation, don't confuse macOS for Unix when selecting dylib name
1 parent 2444836 commit dd74844

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

bindings/c/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if (ACCESSKIT_BUILD_LIBRARIES)
6060
)
6161
install(FILES
6262
"$<$<NOT:$<STREQUAL:$<TARGET_PROPERTY:accesskit-shared,IMPORTED_IMPLIB>,>>:$<TARGET_PROPERTY:accesskit-shared,IMPORTED_IMPLIB>>"
63-
RENAME "accesskit.lib"
63+
RENAME "libaccesskit.a"
6464
DESTINATION "${ACCESSKIT_LIBRARIES_DIR}/shared"
6565
)
6666
endif()

bindings/c/accesskit-config.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ elseif (_accesskit_os STREQUAL "windows")
2121
endif()
2222

2323
add_library(accesskit-shared SHARED IMPORTED GLOBAL)
24-
find_library(_accesskit_implib accesskit "${ACCESSKIT_LIBRARIES_DIR}/shared")
2524
if (_accesskit_os STREQUAL "macos")
2625
set_property(
2726
TARGET accesskit-shared
2827
PROPERTY INTERFACE_LINK_DIRECTORIES "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
2928
)
3029
elseif (_accesskit_os STREQUAL "windows")
30+
find_library(_accesskit_implib accesskit "${ACCESSKIT_LIBRARIES_DIR}/shared")
3131
set_property(
3232
TARGET accesskit-shared
3333
PROPERTY IMPORTED_IMPLIB "${_accesskit_implib}"
3434
)
3535
endif()
36-
if (_accesskit_os STREQUAL "linux")
37-
set(_accesskit_shared_lib "libaccesskit.so")
38-
elseif (_accesskit_os STREQUAL "macos")
36+
if (_accesskit_os STREQUAL "macos")
3937
set(_accesskit_shared_lib "libaccesskit.dylib")
38+
elseif (_accesskit_os STREQUAL "linux")
39+
set(_accesskit_shared_lib "libaccesskit.so")
4040
elseif (_accesskit_os STREQUAL "windows")
4141
set(_accesskit_shared_lib "accesskit.dll")
4242
endif()

0 commit comments

Comments
 (0)