Rebase from 'upstream'

luxonis · Jun 12, 2024 · 561ae0e · 561ae0e
1 parent fc00291
commit 561ae0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package depthai
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.26.1 (2024-06-12)
+-----------
+* Fix building shared libs (ROS only)
+
 2.26.0 (2024-05-27)
 -----------
 * PointCloud node along with the PointCloudData message

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,10 @@ if(NOT WIN32)
     set(HUNTER_CONFIGURATION_TYPES "Release" CACHE STRING "Hunter dependencies list of build configurations")
 endif()
 
+set(HUNTER_SKIP_PACKAGE_nlohmann_json OFF)
+set(BUILD_SHARED_LIBS ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # Early options
 option(DEPTHAI_ENABLE_LIBUSB "Enable usage of libusb and interaction with USB devices" ON)
 
@@ -46,7 +50,7 @@ if(WIN32)
 endif()
 
 # Create depthai project
-project(depthai VERSION "2.26.0" LANGUAGES CXX C)
+project(depthai VERSION "2.26.1" LANGUAGES CXX C)
 get_directory_property(has_parent PARENT_DIRECTORY)
 if(has_parent)
     set(DEPTHAI_VERSION ${PROJECT_VERSION} PARENT_SCOPE)

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>depthai</name>
-  <version>2.26.0</version>
+  <version>2.26.1</version>
   <description>DepthAI core is a C++ library which comes with firmware and an API to interact with OAK Platform</description>
 
   <maintainer email="[email protected]">Adam Serafin</maintainer>