Skip to content

Commit ae64216

Browse files
committed
specify cmake version
1 parent 38667a8 commit ae64216

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/conan.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ jobs:
5454
- name: Checkout Code
5555
uses: actions/checkout@v4
5656

57-
#- name: Install cmake
58-
#uses: ssrobins/install-cmake@v1
59-
#with:
60-
#version: 3.27.2
57+
- name: Install cmake
58+
uses: ssrobins/install-cmake@v1
59+
with:
60+
version: 3.27.2
6161

6262
- name: Install python
6363
uses: actions/setup-python@v5
@@ -73,7 +73,7 @@ jobs:
7373
- name: Install conan
7474
uses: crazy-max/ghaction-chocolatey@v3
7575
with:
76-
args: install -y conan cmake git 7zip jq
76+
args: install -y conan git 7zip jq #cmake
7777

7878
# Ensures that things installed with choco are visible to us
7979
- name: refresh env
@@ -95,7 +95,7 @@ jobs:
9595
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
9696
refreshenv
9797
conan profile detect
98-
conan create . --build=missing -s compiler.cppstd=17
98+
conan create . --build=missing -s compiler.cppstd=17 -c:h tools.microsoft.winsdk_version=10.0.17763.0
9999
env:
100100
CONAN_USER_HOME: c:/cache
101101
CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths

conanfile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ def package_info(self):
9393

9494
# TODO(RSDK-10366): Currently, rust_utils is not published for windows
9595
# and the C++ SDK just doesn't include it as a dependency on that platform
96-
if not self.settings.os == "Windows":
97-
self.cpp_info.components["viam_rust_utils"].libs = ["viam_rust_utils"]
96+
# if not self.settings.os == "Windows":
97+
self.cpp_info.components["viam_rust_utils"].libs = ["viam_rust_utils"]
9898

9999
self.cpp_info.components["viamsdk"].libs = ["viamsdk"]
100100

@@ -139,9 +139,9 @@ def package_info(self):
139139

140140
# TODO(RSDK-10366): Currently, rust_utils is not published for windows
141141
# and the C++ SDK just doesn't include it as a dependency on that platform
142-
if self.settings.os != "Windows":
143-
self.cpp_info.components["viamsdk"].requires.extend([
144-
"viam_rust_utils"
145-
])
142+
# if self.settings.os != "Windows":
143+
self.cpp_info.components["viamsdk"].requires.extend([
144+
"viam_rust_utils"
145+
])
146146

147147
self.cpp_info.components["viamsdk"].frameworks = ["Security"]

0 commit comments

Comments
 (0)