Skip to content

Commit 952702b

Browse files
committed
revert to linking to viamsdk, not rust-utils
1 parent 4b68fda commit 952702b

File tree

2 files changed

+11
-23
lines changed

2 files changed

+11
-23
lines changed

CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -312,18 +312,6 @@ if (NOT WIN32 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") # build `SHARED` on
312312
set_property(TARGET viam_rust_utils PROPERTY IMPORTED_LOCATION ${viam_rust_utils_file})
313313
endif()
314314

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()
326-
327315
if (NOT BUILD_SHARED_LIBS) # installing seems to be necessary for tests to pass in CI
328316
install(
329317
IMPORTED_RUNTIME_ARTIFACTS viam_rust_utils

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)