[zdepth][sesame_ros] specify ROS_DISTRO for ros-obese

jsk-ros-pkg · Nov 25, 2024 · 908a934 · 908a934
1 parent f32d0b6
commit 908a934
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/3rdparty/zdepth/CMakeLists.txt b/3rdparty/zdepth/CMakeLists.txt
@@ -3,7 +3,7 @@ project(zdepth)
 
 include(ExternalProject)
 
-if("$ENV{ROS_DISTRO}" STRGREATER "kinetic")
+if(NOT "$ENV{ROS_DISTRO}" STREQUAL "indigo" OR NOT "$ENV{ROS_DISTRO}" STREQUAL "kinetic")
   ExternalProject_Add(
     zdepth
     GIT_REPOSITORY  https://github.com/catid/Zdepth.git

diff --git a/sesame_ros/CMakeLists.txt b/sesame_ros/CMakeLists.txt
@@ -20,9 +20,9 @@ catkin_package(
   CATKIN_DEPENDS message_runtime
 )
 
-if($ENV{ROS_DISTRO} STRGREATER "melodic")
+if($ENV{ROS_DISTRO} STREQUAL "kinetic" OR $ENV{ROS_DISTRO} STREQUAL "melodic")
   catkin_generate_virtualenv(
-    PYTHON_INTERPRETER python3
+    PYTHON_INTERPRETER python2
     CHECK_VENV FALSE
     )
 elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
@@ -34,7 +34,7 @@ elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
   )
 else()
   catkin_generate_virtualenv(
-    PYTHON_INTERPRETER python2
+    PYTHON_INTERPRETER python3
     CHECK_VENV FALSE
     )
 endif()