Move ament_cmake_ros_isolated_gmock into ament_cmake_ros too

Signed-off-by: Pete Baughman <pete.baughman@apex.ai>
ros2 · Jun 11, 2019 · 4352af2 · 4352af2
1 parent e1bf0e1
commit 4352af2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/ament_cmake_ros/ament_cmake_ros-extras.cmake.in b/ament_cmake_ros/ament_cmake_ros-extras.cmake.in
@@ -14,8 +14,10 @@
 
 # generated from ament_cmake_ros/ament_cmake_ros-extras.cmake.in
 
+find_package(ament_cmake_gmock QUIET REQUIRED)
 find_package(ament_cmake_gtest QUIET REQUIRED)
 find_package(ament_cmake_pytest QUIET REQUIRED)
+include("${ament_cmake_ros_DIR}/ament_add_ros_isolated_gmock.cmake")
 include("${ament_cmake_ros_DIR}/ament_add_ros_isolated_gtest.cmake")
 include("${ament_cmake_ros_DIR}/ament_add_ros_isolated_pytest.cmake")
 

diff --git a/.../cmake/ament_add_ros_isolated_gmock.cmake → .../cmake/ament_add_ros_isolated_gmock.cmake b/.../cmake/ament_add_ros_isolated_gmock.cmake → .../cmake/ament_add_ros_isolated_gmock.cmake
@@ -27,7 +27,7 @@
 
 function(ament_add_ros_isolated_gmock target)
 
-  set(RUNNER "RUNNER" "${ament_cmake_ros_isolated_test_DIR}/run_test_isolated.py")
+  set(RUNNER "RUNNER" "${ament_cmake_ros_DIR}/run_test_isolated.py")
 
   ament_add_gmock(
     "${target}"

diff --git a/ament_cmake_ros/package.xml b/ament_cmake_ros/package.xml
@@ -12,6 +12,7 @@
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
   <buildtool_export_depend>ament_cmake_gtest</buildtool_export_depend>
+  <buildtool_export_depend>ament_cmake_gmock</buildtool_export_depend>
   <buildtool_export_depend>ament_cmake_pytest</buildtool_export_depend>
 
   <test_depend>ament_lint_auto</test_depend>