Merge branch 'main' of github.com:viamrobotics/viam-cpp-sdk into conan-windows

Author: lia-viam

CMakeLists.txt

@@ -41,7 +41,7 @@ else()
   cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 endif()
 
-set(CMAKE_PROJECT_VERSION 0.13.0)
+set(CMAKE_PROJECT_VERSION 0.13.2)
 
 # Identify the project.
 project(viam-cpp-sdk

README.md

@@ -97,6 +97,20 @@ to change without warning. In particular, using Boost.Log macros such as
 `BOOST_LOG_TRIVIAL` or `BOOST_LOG_SEV` is undefined behavior which will likely
 fail to output log messages.
 
+## Running Tests
+Tests for the SDK are located in `src/viam/sdk/tests`. The CMakeLists.txt file in that directory defines how to build them. When the SDK is built, the test executables are placed in the test folder within your specified build directory (e.g., `build`, if you followed the instructions in [`BUILDING.md`](https://github.com/viamrobotics/viam-cpp-sdk/blob/main/BUILDING.md)). The test executable files can be run individually. To run the entire test suite at once, navigate to the `tests` folder in your build directory and run:
+```
+ctest
+```
+Or to avoid navigating all the way to the folder you can specify the test directory, for example:
+```
+ctest --test-dir build/src/viam/sdk/tests/
+```
+Additionally, for more useful ctest options explore:
+```
+ctest --help
+```
+
 ## License
 Copyright 2022 Viam Inc.
 

conanfile.py

@@ -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
@@ -43,19 +44,24 @@ 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]'
 
     def requirements(self):
-        self.requires('boost/[>=1.74.0]', transitive_headers=True)
+        if self.settings.os == "Windows":
+            # This is temporary pending the resolution of a windows compilation
+            # issue on boost 1.88.0
+            self.requires('boost/[>=1.74.0 <1.88.0]', transitive_headers=True)
+        else:
+            self.requires('boost/[>=1.74.0]', transitive_headers=True)
 
         # The SDK supports older grpc and protobuf, but these are the oldest
         # maintained conan packages.
@@ -116,6 +122,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")
 

src/viam/api/api_proto_tag.lock

@@ -1 +1 @@
-v0.1.438
+v0.1.444