Skip to content

fix detection of c++14 #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 28, 2025
Merged

fix detection of c++14 #442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6dbb3
use valid max cpp std
lia-viam May 28, 2025
90afcbd
extend system libs on windows
lia-viam May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from conan import ConanFile
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.build import valid_max_cppstd
from conan.tools.files import load
from conan.tools.apple import is_apple_os
import os
Expand Down Expand Up @@ -43,13 +44,13 @@ def configure(self):
self.options[lib].shared = True

def _xtensor_requires(self):
if self.settings.compiler.cppstd in ["14", "gnu14"]:
if valid_max_cppstd(self, 14, False):
return 'xtensor/[>=0.24.3 <0.26.0]'

return 'xtensor/[>=0.24.3]'

def _grpc_requires(self):
if self.settings.compiler.cppstd in ["14", "gnu14"]:
if valid_max_cppstd(self, 14, False):
return 'grpc/[>=1.48.4 <1.70.0]'

return 'grpc/[>=1.48.4]'
Expand Down Expand Up @@ -116,6 +117,8 @@ def package_info(self):

if self.settings.os in ["Linux", "FreeBSD"]:
self.cpp_info.components["viamsdk"].system_libs.extend(["dl", "rt"])
elif self.settings.os == "Windows":
self.cpp_info.components["viamsdk"].system_libs.extend(["ncrypt", "secur32", "ntdll", "userenv"])

self.cpp_info.components["viamapi"].includedirs.append("include/viam/api")

Expand Down
Loading