Skip to content

Commit ed63e70

Browse files
committed
[nfc_ros] nfcpy requries python3.6+, skip kinetic which has python3.5
1 parent 7c8a968 commit ed63e70

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

nfc_ros/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ catkin_package(
2020
CATKIN_DEPENDS message_runtime
2121
)
2222

23-
if ("$ENV{ROS_DISTRO}" MATCHES "indigo")
23+
if ("$ENV{ROS_DISTRO}" MATCHES "indigo" OR "$ENV{ROS_DISTRO}" MATCHES "kinetic")
2424
message(WARNING "nfc_ros requires python3.6 or newer. For indigo, virtualenv generation is skipped.")
2525
else()
2626
catkin_generate_virtualenv(
@@ -36,7 +36,7 @@ install(FILES requirements.txt
3636
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
3737
)
3838

39-
if(CATKIN_ENABLE_TESTING)
39+
if(CATKIN_ENABLE_TESTING AND ("$ENV{ROS_DISTRO}" MATCHES "indigo" OR "$ENV{ROS_DISTRO}" MATCHES "kinetic"))
4040
find_package(rostest REQUIRED)
4141
add_rostest(test/test_rospy_node.test
4242
DEPENDENCIES ${PROJECT_NAME}_generate_virtualenv

0 commit comments

Comments
 (0)