|
1 | 1 | from conan import ConanFile |
2 | 2 | from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout |
| 3 | +from conan.tools.build import valid_max_cppstd |
3 | 4 | from conan.tools.files import load |
4 | 5 | from conan.tools.apple import is_apple_os |
5 | 6 | import os |
@@ -43,13 +44,13 @@ def configure(self): |
43 | 44 | self.options[lib].shared = True |
44 | 45 |
|
45 | 46 | def _xtensor_requires(self): |
46 | | - if self.settings.compiler.cppstd in ["14", "gnu14"]: |
| 47 | + if valid_max_cppstd(self, 14, False): |
47 | 48 | return 'xtensor/[>=0.24.3 <0.26.0]' |
48 | 49 |
|
49 | 50 | return 'xtensor/[>=0.24.3]' |
50 | 51 |
|
51 | 52 | def _grpc_requires(self): |
52 | | - if self.settings.compiler.cppstd in ["14", "gnu14"]: |
| 53 | + if valid_max_cppstd(self, 14, False): |
53 | 54 | return 'grpc/[>=1.48.4 <1.70.0]' |
54 | 55 |
|
55 | 56 | return 'grpc/[>=1.48.4]' |
@@ -116,6 +117,8 @@ def package_info(self): |
116 | 117 |
|
117 | 118 | if self.settings.os in ["Linux", "FreeBSD"]: |
118 | 119 | self.cpp_info.components["viamsdk"].system_libs.extend(["dl", "rt"]) |
| 120 | + elif self.settings.os == "Windows": |
| 121 | + self.cpp_info.components["viamsdk"].system_libs.extend(["ncrypt", "secur32", "ntdll", "userenv"]) |
119 | 122 |
|
120 | 123 | self.cpp_info.components["viamapi"].includedirs.append("include/viam/api") |
121 | 124 |
|
|
0 commit comments