Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.3)
project(rttlua_completion)

find_package(catkin REQUIRED)
catkin_package()
catkin_add_env_hooks(10.rttlua_completion SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)

find_package(ament_cmake REQUIRED)
ament_environment_hooks(env-hooks/rttlua_completion.sh.in)
ament_package()
#############
## Install ##
#############
Expand Down Expand Up @@ -49,11 +48,12 @@ set_target_properties(readline PROPERTIES PREFIX "")
file(GLOB LUA_FILES "*.lua")
install(
FILES ${LUA_FILES}
DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/lua/5.1/rttlua_completion/
DESTINATION share/lua/5.1/rttlua_completion/
)

install(
TARGETS readline
DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/lua/5.1/rttlua_completion/
DESTINATION share/lua/5.1/rttlua_completion/
)


10 changes: 0 additions & 10 deletions env-hooks/10.rttlua_completion.sh.develspace.in

This file was deleted.

6 changes: 0 additions & 6 deletions manifest.xml

This file was deleted.

6 changes: 5 additions & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@

<!-- The *_depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>ament_cmake</buildtool_depend>

<run_depend>ocl</run_depend>

<export>
<build_type>ament_cmake</build_type>
</export>

</package>