Skip to content

Commit bffdabb

Browse files
committed
Fix linking issues on Linux
1 parent dd74844 commit bffdabb

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

bindings/c/accesskit-config.cmake

+5-12
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,16 @@ set_property(
99
PROPERTY IMPORTED_LOCATION "${_accesskit_static_lib}"
1010
)
1111
if (_accesskit_os STREQUAL "macos")
12-
set_property(
13-
TARGET accesskit-static
14-
PROPERTY INTERFACE_LINK_DIRECTORIES "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
15-
)
12+
target_link_directories(accesskit-static INTERFACE "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib")
13+
elseif (_accesskit_os STREQUAL "linux")
14+
target_link_libraries(accesskit-static INTERFACE -static-libgcc m)
1615
elseif (_accesskit_os STREQUAL "windows")
17-
set_property(
18-
TARGET accesskit-static
19-
PROPERTY INTERFACE_LINK_LIBRARIES bcrypt ntdll uiautomationcore userenv ws2_32
20-
)
16+
target_link_libraries(accesskit-static INTERFACE bcrypt ntdll uiautomationcore userenv ws2_32)
2117
endif()
2218

2319
add_library(accesskit-shared SHARED IMPORTED GLOBAL)
2420
if (_accesskit_os STREQUAL "macos")
25-
set_property(
26-
TARGET accesskit-shared
27-
PROPERTY INTERFACE_LINK_DIRECTORIES "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
28-
)
21+
target_link_directories(accesskit-shared INTERFACE "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib")
2922
elseif (_accesskit_os STREQUAL "windows")
3023
find_library(_accesskit_implib accesskit "${ACCESSKIT_LIBRARIES_DIR}/shared")
3124
set_property(

bindings/c/accesskit.cmake

+4-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,7 @@ if (NOT _accesskit_arch)
3838
endif()
3939
endif()
4040

41-
set(ACCESSKIT_LIBRARIES_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/${_accesskit_os}/${_accesskit_arch}/${_accesskit_toolchain}")
41+
set(ACCESSKIT_LIBRARIES_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/${_accesskit_os}/${_accesskit_arch}")
42+
if (_accesskit_toolchain)
43+
string(APPEND ACCESSKIT_LIBRARIES_DIR "/${_accesskit_toolchain}")
44+
endif()

0 commit comments

Comments
 (0)