Skip to content

Commit b4c4b84

Browse files
committed
just hardcode lib
1 parent 73c5410 commit b4c4b84

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ if (WIN32)
4040

4141
# rust-utils always has a `lib` prefix
4242
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
43+
message(WARNING "it should be lib is it? ${CMAKE_SHARED_LIBRARY_PREFIX}")
4344

4445
# set boost compiler to avoid errors with boost log
4546
set(Boost_COMPILER "vc143")
@@ -258,9 +259,9 @@ find_package(Threads REQUIRED)
258259
# TODO: When this is removed, also remove the
259260
# `target_link_directories` call down in src/CMakeLists.txt, as it
260261
# will no longer be needed.
261-
set(viam_rust_utils_file ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}viam_rust_utils${CMAKE_STATIC_LIBRARY_SUFFIX})
262+
set(viam_rust_utils_file ${CMAKE_CURRENT_BINARY_DIR}/libviam_rust_utils${CMAKE_STATIC_LIBRARY_SUFFIX})
262263

263-
file(GLOB viam_rust_utils_files ${PROJECT_SOURCE_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}viam_rust_utils*${CMAKE_STATIC_LIBRARY_SUFFIX})
264+
file(GLOB viam_rust_utils_files ${PROJECT_SOURCE_DIR}/libviam_rust_utils*${CMAKE_STATIC_LIBRARY_SUFFIX})
264265

265266
# Check if the architecture is one that we support in rust-utils
266267
set(WINDOWS_ARCHS "AMD64" "X86" "X64")
@@ -297,7 +298,7 @@ elseif(NOT WIN32 OR rust_utils_supported_windows_arch) # TODO(RSDK-10366): Curre
297298
message(WARNING "It is win32")
298299
set(shared_library_prefix "lib")
299300
endif()
300-
message(WARNING "shared library prefix is ${CMAKE_SHARED_LIBRARY_PREFIX}")
301+
message(WARNING "shared library prefix is ${CMAKE_SHARED_LIBRARY_PREFIX} or ${shared_library_prefix}")
301302
message(WARNING "trying to download https://github.com/viamrobotics/rust-utils/releases/latest/download/${CMAKE_SHARED_LIBRARY_PREFIX}viam_rust_utils-${lvru_system_name}_${lvru_system_processor}${CMAKE_STATIC_LIBRARY_SUFFIX}")
302303

303304
file(

0 commit comments

Comments
 (0)