Skip to content

Commit 6e77560

Browse files
committed
static for windows only, import chrono
1 parent 3ee79d5 commit 6e77560

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

.github/workflows/conan.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
#- name: Install dependencies
7575
#uses: crazy-max/ghaction-chocolatey@v3
7676
#with:
77-
#args: install -y conan git 7zip jq
77+
#args: install -y conan git
7878

7979
## Ensures that things installed with choco are visible to us
8080
#- name: refresh env
@@ -88,12 +88,7 @@ jobs:
8888
#Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
8989
#refreshenv
9090
#conan profile detect
91-
#conan create . `
92-
#--build=missing `
93-
#-o "&:shared=False" `
94-
#-s:h compiler.cppstd=17 `
95-
#-c:h tools.microsoft:winsdk_version=10.0.17763.0 `
96-
#-s:h compiler.runtime=static
91+
#conan create .
9792
#env:
9893
#CONAN_USER_HOME: c:/cache
9994
#CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths

.github/workflows/release.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
#- name: Install dependencies
7474
#uses: crazy-max/ghaction-chocolatey@v3
7575
#with:
76-
#args: install -y conan git 7zip jq
76+
#args: install -y conan git
7777

7878

7979
## Ensures that things installed with choco are visible to us
@@ -88,12 +88,7 @@ jobs:
8888
#Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
8989
#refreshenv
9090
#conan profile detect
91-
#conan create . `
92-
#--build=missing `
93-
#-o "&:shared=False" `
94-
#-s:h compiler.cppstd=17 `
95-
#-c:h tools.microsoft:winsdk_version=10.0.17763.0 `
96-
#-s:h compiler.runtime=static
91+
#conan create .
9792
#env:
9893
#CONAN_USER_HOME: c:/cache
9994
#CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,16 +288,17 @@ 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-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)
291+
if (NOT WIN32) # build `SHARED` on unix-based systems
293292
add_library(viam_rust_utils SHARED IMPORTED)
294293
target_link_directories(viam_rust_utils
295294
INTERFACE
296295
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
297296
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>"
298297
)
299298
set_property(TARGET viam_rust_utils PROPERTY IMPORTED_LOCATION ${viam_rust_utils_file})
300-
elseif (num_viam_rust_utils_files GREATER 0)
299+
300+
# 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
301+
elseif (num_viam_rust_utils_files GREATER 0) # build `STATIC` for windows
301302
add_library(viam_rust_utils STATIC IMPORTED)
302303
target_link_directories(viam_rust_utils
303304
INTERFACE

src/viam/sdk/rpc/server.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
/// @brief Defines the `Server` class.
44
#pragma once
55

6+
#include <chrono>
7+
68
#include <viam/sdk/common/grpc_fwd.hpp>
79
#include <viam/sdk/resource/resource.hpp>
810
#include <viam/sdk/resource/resource_api.hpp>

0 commit comments

Comments
 (0)