Skip to content

Commit 8ff02cb

Browse files
jaiveersinghNVjaiveersinghNV
authored
Merge pull request #56 from NVIDIA-ISAAC-ROS/release-3.2
2 parents 96a1e6d + 5f096e7 commit 8ff02cb

File tree

8 files changed

+44
-9
lines changed

8 files changed

+44
-9
lines changed

‎isaac_ros_dnn_image_encoder/CMakeLists.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,22 @@ set_target_properties(dnn_image_encoder_node PROPERTIES
3636

3737
if(BUILD_TESTING)
3838
find_package(ament_lint_auto REQUIRED)
39+
find_package(ament_cmake_gtest REQUIRED)
3940
ament_lint_auto_find_test_dependencies()
4041

42+
# Force use of ROS2 vendor googletest to avoid version conflicts
43+
set(CMAKE_IGNORE_PATH "/usr/src/googletest" ${CMAKE_IGNORE_PATH})
44+
set(CMAKE_IGNORE_PATH "/usr/include/gtest" ${CMAKE_IGNORE_PATH})
45+
set(CMAKE_IGNORE_PATH "/usr/include/gmock" ${CMAKE_IGNORE_PATH})
46+
47+
# Explicitly use ROS2 vendor googletest/gmock
48+
include_directories(BEFORE /opt/ros/humble/src/gtest_vendor/include)
49+
include_directories(BEFORE /opt/ros/humble/src/gmock_vendor/include)
50+
4151
# Gtest for dnn image encoder node
4252
ament_add_gtest(dnn_image_encoder_node_test test/dnn_image_encoder_node_test.cpp)
4353
target_link_libraries(dnn_image_encoder_node_test dnn_image_encoder_node)
4454
target_include_directories(dnn_image_encoder_node_test PUBLIC include/isaac_ros_dnn_image_encoder/)
45-
target_include_directories(dnn_image_encoder_node_test PUBLIC /usr/src/googletest/googlemock/include/)
4655
ament_target_dependencies(dnn_image_encoder_node_test rclcpp)
4756
ament_target_dependencies(dnn_image_encoder_node_test isaac_ros_nitros)
4857

‎isaac_ros_dnn_image_encoder/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_dnn_image_encoder</name>
24-
<version>3.2.5</version>
24+
<version>3.2.10</version>
2525
<description>Encoder for preprocessing images into tensors for deep learning inference</description>
2626
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>
2727
<license>Apache-2.0</license>

‎isaac_ros_tensor_proc/CMakeLists.txt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,28 @@ ament_auto_add_library(normalize_node SHARED src/normalize_node.cpp)
8585

8686
if(BUILD_TESTING)
8787
find_package(ament_lint_auto REQUIRED)
88+
find_package(ament_cmake_gtest REQUIRED)
8889
ament_lint_auto_find_test_dependencies()
8990

91+
# Force use of ROS2 vendor googletest to avoid version conflicts
92+
set(CMAKE_IGNORE_PATH "/usr/src/googletest" ${CMAKE_IGNORE_PATH})
93+
set(CMAKE_IGNORE_PATH "/usr/include/gtest" ${CMAKE_IGNORE_PATH})
94+
set(CMAKE_IGNORE_PATH "/usr/include/gmock" ${CMAKE_IGNORE_PATH})
95+
96+
# Explicitly use ROS2 vendor googletest/gmock
97+
include_directories(BEFORE /opt/ros/humble/src/gtest_vendor/include)
98+
include_directories(BEFORE /opt/ros/humble/src/gmock_vendor/include)
99+
90100
# Gtest for interleaved_to_planar_node
91101
ament_add_gtest(interleaved_to_planar_node_test test/interleaved_to_planar_node_test.cpp)
92102
target_link_libraries(interleaved_to_planar_node_test interleaved_to_planar_node)
93103
target_include_directories(interleaved_to_planar_node_test PUBLIC include/isaac_ros_tensor_proc/)
94-
target_include_directories(interleaved_to_planar_node_test PUBLIC /usr/src/googletest/googlemock/include/)
95104
ament_target_dependencies(interleaved_to_planar_node_test rclcpp)
96105
ament_target_dependencies(interleaved_to_planar_node_test isaac_ros_nitros)
97106
# Gtest for normalize_node
98107
ament_add_gtest(normalize_node_test test/normalize_node_test.cpp)
99108
target_link_libraries(normalize_node_test normalize_node)
100109
target_include_directories(normalize_node_test PUBLIC include/isaac_ros_tensor_proc/)
101-
target_include_directories(normalize_node_test PUBLIC /usr/src/googletest/googlemock/include/)
102110
ament_target_dependencies(normalize_node_test rclcpp)
103111
ament_target_dependencies(normalize_node_test isaac_ros_nitros)
104112

‎isaac_ros_tensor_proc/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_tensor_proc</name>
24-
<version>3.2.5</version>
24+
<version>3.2.10</version>
2525
<description>Processing operations for tensors</description>
2626
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>
2727
<license>Apache-2.0</license>

‎isaac_ros_tensor_rt/CMakeLists.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,22 @@ set_target_properties(tensor_rt_node PROPERTIES
4141

4242
if(BUILD_TESTING)
4343
find_package(ament_lint_auto REQUIRED)
44+
find_package(ament_cmake_gtest REQUIRED)
4445
ament_lint_auto_find_test_dependencies()
4546

47+
# Force use of ROS2 vendor googletest to avoid version conflicts
48+
set(CMAKE_IGNORE_PATH "/usr/src/googletest" ${CMAKE_IGNORE_PATH})
49+
set(CMAKE_IGNORE_PATH "/usr/include/gtest" ${CMAKE_IGNORE_PATH})
50+
set(CMAKE_IGNORE_PATH "/usr/include/gmock" ${CMAKE_IGNORE_PATH})
51+
52+
# Explicitly use ROS2 vendor googletest/gmock
53+
include_directories(BEFORE /opt/ros/humble/src/gtest_vendor/include)
54+
include_directories(BEFORE /opt/ros/humble/src/gmock_vendor/include)
55+
4656
# Add gtests
4757
ament_add_gtest(tensor_rt_node_test test/tensor_rt_node_test.cpp)
4858
target_link_libraries(tensor_rt_node_test tensor_rt_node)
4959
target_include_directories(tensor_rt_node_test PUBLIC include/isaac_ros_tensor_rt/)
50-
target_include_directories(tensor_rt_node_test PUBLIC /usr/src/googletest/googlemock/include/)
5160
ament_target_dependencies(tensor_rt_node_test rclcpp)
5261
ament_target_dependencies(tensor_rt_node_test isaac_ros_nitros)
5362

‎isaac_ros_tensor_rt/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_tensor_rt</name>
24-
<version>3.2.5</version>
24+
<version>3.2.10</version>
2525
<description>DNN Inference support for Isaac ROS</description>
2626

2727
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>

‎isaac_ros_triton/CMakeLists.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,22 @@ set_target_properties(triton_node PROPERTIES
3737

3838
if(BUILD_TESTING)
3939
find_package(ament_lint_auto REQUIRED)
40+
find_package(ament_cmake_gtest REQUIRED)
4041
ament_lint_auto_find_test_dependencies()
4142

43+
# Force use of ROS2 vendor googletest to avoid version conflicts
44+
set(CMAKE_IGNORE_PATH "/usr/src/googletest" ${CMAKE_IGNORE_PATH})
45+
set(CMAKE_IGNORE_PATH "/usr/include/gtest" ${CMAKE_IGNORE_PATH})
46+
set(CMAKE_IGNORE_PATH "/usr/include/gmock" ${CMAKE_IGNORE_PATH})
47+
48+
# Explicitly use ROS2 vendor googletest/gmock
49+
include_directories(BEFORE /opt/ros/humble/src/gtest_vendor/include)
50+
include_directories(BEFORE /opt/ros/humble/src/gmock_vendor/include)
51+
4252
# Gtest for triton node
4353
ament_add_gtest(triton_node_test test/triton_node_test.cpp)
4454
target_link_libraries(triton_node_test triton_node)
4555
target_include_directories(triton_node_test PUBLIC include/isaac_ros_triton_node/)
46-
target_include_directories(triton_node_test PUBLIC /usr/src/googletest/googlemock/include/)
4756
ament_target_dependencies(triton_node_test rclcpp)
4857
ament_target_dependencies(triton_node_test isaac_ros_nitros)
4958

‎isaac_ros_triton/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_triton</name>
24-
<version>3.2.5</version>
24+
<version>3.2.10</version>
2525
<description>DNN Inference support for Isaac ROS</description>
2626

2727
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>

0 commit comments

Comments
 (0)