Skip to content

Commit

Permalink
[ROS1] Fix Noetic release / Python3 (#39)
Browse files Browse the repository at this point in the history
* Update CMakeLists

* joystick_relay.py: Fix shebang for correct catkin_install_python

Resolves #22
  • Loading branch information
wxmerkt authored Oct 23, 2022
1 parent 6e53c11 commit deaca20
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ find_package(catkin REQUIRED
visualization_msgs
diagnostic_updater)

find_package(Boost REQUIRED)

set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")

catkin_package(
INCLUDE_DIRS include
CATKIN_DEPENDS
Expand All @@ -22,7 +18,7 @@ catkin_package(
visualization_msgs
diagnostic_updater)

include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
include_directories(include ${catkin_INCLUDE_DIRS})

add_executable(twist_mux
src/twist_mux.cpp
Expand All @@ -45,9 +41,8 @@ foreach(dir launch config)
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
endforeach()

install(DIRECTORY include/
DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h"
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
)

if (CATKIN_ENABLE_TESTING)
Expand Down
2 changes: 1 addition & 1 deletion scripts/joystick_relay.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# twist_mux: joystick_relay.py
Expand Down

0 comments on commit deaca20

Please sign in to comment.