Skip to content

Commit d4cb253

Browse files
committed
a couple more comment cleanups
1 parent add6916 commit d4cb253

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ else()
288288
message(WARNING "Currently running on Windows with no rust-utils file. Module code should work as expected, but client code may fail unexpectedly.")
289289
endif()
290290

291-
# TODO(RSDK-10366): Currently, rust_utils is not published for windows, so don't even declare the library
292-
if (NOT WIN32)
291+
# TODO(RSDK-10637): Currently, rust_utils doesn't build correctly for windows in CI, so don't declare the library unless a user has provided their own build
292+
if (NOT WIN32 OR num_viam_rust_utils_files GREATER 0)
293293
add_library(viam_rust_utils STATIC IMPORTED)
294294

295295
target_link_directories(viam_rust_utils

conanfile.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ def package(self):
9191

9292
def package_info(self):
9393

94-
# TODO(RSDK-10366): Currently, rust_utils is not published for windows
95-
# and the C++ SDK just doesn't include it as a dependency on that platform
9694
self.cpp_info.components["viam_rust_utils"].libs = ["viam_rust_utils"]
9795

9896
self.cpp_info.components["viamsdk"].libs = ["viamsdk"]
@@ -136,8 +134,6 @@ def package_info(self):
136134
"viamapi",
137135
])
138136

139-
# TODO(RSDK-10366): Currently, rust_utils is not published for windows
140-
# and the C++ SDK just doesn't include it as a dependency on that platform
141137
self.cpp_info.components["viamsdk"].requires.extend([
142138
"viam_rust_utils"
143139
])

src/viam/examples/modules/complex/proto/buf.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ deps:
44
- remote: buf.build
55
owner: googleapis
66
repository: googleapis
7-
commit: 751cbe31638d43a9bfb6162cd2352e67
8-
digest: shake256:87f55470d9d124e2d1dedfe0231221f4ed7efbc55bc5268917c678e2d9b9c41573a7f9a557f6d8539044524d9fc5ca8fbb7db05eb81379d168285d76b57eb8a4
7+
commit: 61b203b9a9164be9a834f58c37be6f62
8+
digest: shake256:e619113001d6e284ee8a92b1561e5d4ea89a47b28bf0410815cb2fa23914df8be9f1a6a98dcf069f5bc2d829a2cfb1ac614863be45cd4f8a5ad8606c5f200224

0 commit comments

Comments
 (0)