Skip to content

Commit 51de5d8

Browse files
committed
try stuff from CR comments
1 parent c66a2e0 commit 51de5d8

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

.github/workflows/conan.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ jobs:
5757
- name: Checkout Code
5858
uses: actions/checkout@v4
5959

60-
- name: Install cmake
61-
uses: ssrobins/install-cmake@v1
62-
with:
63-
version: 3.27.2
60+
#- name: Install cmake
61+
#uses: ssrobins/install-cmake@v1
62+
#with:
63+
#version: 3.27.2
6464

65-
- name: Install python
66-
uses: actions/setup-python@v5
67-
with:
68-
python-version: '3.12'
65+
#- name: Install python
66+
#uses: actions/setup-python@v5
67+
#with:
68+
#python-version: '3.12'
6969

70-
- name: Install Scoop
71-
uses: MinoruSekine/[email protected]
70+
#- name: Install Scoop
71+
#uses: MinoruSekine/[email protected]
7272

73-
- name: install buf 'n stuff
74-
run: scoop install buf ninja
73+
#- name: install buf 'n stuff
74+
#run: scoop install buf ninja
7575

7676
- name: Install dependencies
7777
uses: crazy-max/ghaction-chocolatey@v3
@@ -84,7 +84,11 @@ jobs:
8484
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
8585
refreshenv
8686
conan profile detect
87-
conan create .
87+
conan create . `
88+
--build=missing `
89+
-o "&:shared=False" `
90+
-s:h compiler.cppstd=17 `
91+
-s:h compiler.runtime=static
8892
env:
8993
CONAN_USER_HOME: c:/cache
9094
CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ else()
294294
endif()
295295

296296
if (NOT WIN32) # build `SHARED` on unix-based systems
297-
add_library(viam_rust_utils SHARED IMPORTED)
297+
add_library(viam_rust_utils STATIC IMPORTED)
298298
target_link_directories(viam_rust_utils
299299
INTERFACE
300300
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
@@ -307,6 +307,7 @@ elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") # build `STATIC` for windows
307307
target_link_directories(viam_rust_utils
308308
INTERFACE
309309
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
310+
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>"
310311
)
311312
set_property(TARGET viam_rust_utils PROPERTY IMPORTED_LOCATION ${viam_rust_utils_file})
312313
endif()

0 commit comments

Comments
 (0)