Skip to content

Commit d43865b

Browse files
committed
fix ordering of link libraries for rust-utils
1 parent 1bd47b2 commit d43865b

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

CMakeLists.txt

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -293,18 +293,6 @@ else()
293293
message(WARNING "Currently running on Windows with no rust-utils file. Module code should work as expected, but client code may fail unexpectedly.")
294294
endif()
295295

296-
if (APPLE)
297-
target_link_libraries(viam_rust_utils PUBLIC "-framework Security")
298-
elseif (NOT WIN32)
299-
target_link_libraries(viam_rust_utils PRIVATE dl)
300-
target_link_libraries(viam_rust_utils PRIVATE rt)
301-
else()
302-
target_link_libraries(viam_rust_utils PRIVATE ncrypt)
303-
target_link_libraries(viam_rust_utils PRIVATE secur32)
304-
target_link_libraries(viam_rust_utils PRIVATE ntdll)
305-
target_link_libraries(viam_rust_utils PRIVATE userenv)
306-
endif()
307-
308296
if (NOT WIN32) # build `SHARED` on unix-based systems
309297
add_library(viam_rust_utils SHARED IMPORTED)
310298
target_link_directories(viam_rust_utils
@@ -324,6 +312,17 @@ elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") # build `STATIC` for windows
324312
set_property(TARGET viam_rust_utils PROPERTY IMPORTED_LOCATION ${viam_rust_utils_file})
325313
endif()
326314

315+
if (APPLE)
316+
target_link_libraries(viam_rust_utils INTERFACE "-framework Security")
317+
elseif (NOT WIN32)
318+
target_link_libraries(viam_rust_utils INTERFACE dl)
319+
target_link_libraries(viam_rust_utils INTERFACE rt)
320+
else()
321+
target_link_libraries(viam_rust_utils INTERFACE ncrypt)
322+
target_link_libraries(viam_rust_utils INTERFACE secur32)
323+
target_link_libraries(viam_rust_utils INTERFACE ntdll)
324+
target_link_libraries(viam_rust_utils INTERFACE userenv)
325+
endif()
327326

328327
if (BUILD_SHARED_LIBS) # installing seems to be necessary for tests to pass in CI
329328
install(

src/viam/sdk/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -287,17 +287,17 @@ else()
287287
target_sources(viamsdk PRIVATE rpc/private/viam_rust_utils_stubs.cpp)
288288
endif()
289289

290-
if (APPLE)
291-
target_link_libraries(viamsdk PUBLIC "-framework Security")
292-
elseif (NOT WIN32)
293-
target_link_libraries(viamsdk PRIVATE dl)
294-
target_link_libraries(viamsdk PRIVATE rt)
295-
else()
296-
target_link_libraries(viamsdk PRIVATE ncrypt)
297-
target_link_libraries(viamsdk PRIVATE secur32)
298-
target_link_libraries(viamsdk PRIVATE ntdll)
299-
target_link_libraries(viamsdk PRIVATE userenv)
300-
endif()
290+
#if (APPLE)
291+
#target_link_libraries(viamsdk PUBLIC "-framework Security")
292+
#elseif (NOT WIN32)
293+
#target_link_libraries(viamsdk PRIVATE dl)
294+
#target_link_libraries(viamsdk PRIVATE rt)
295+
#else()
296+
#target_link_libraries(viamsdk PRIVATE ncrypt)
297+
#target_link_libraries(viamsdk PRIVATE secur32)
298+
#target_link_libraries(viamsdk PRIVATE ntdll)
299+
#target_link_libraries(viamsdk PRIVATE userenv)
300+
#endif()
301301

302302

303303
install(

0 commit comments

Comments
 (0)