From 90ede5c96bc4433b8daccb76278ce12347bf9ac0 Mon Sep 17 00:00:00 2001 From: Gianni Borghesan Date: Thu, 1 Apr 2021 09:30:50 +0200 Subject: [PATCH 1/3] change in set evn variables --- env-hooks/10.rttlua_completion.sh.develspace.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env-hooks/10.rttlua_completion.sh.develspace.in b/env-hooks/10.rttlua_completion.sh.develspace.in index 0af8d5c..cf9433e 100644 --- a/env-hooks/10.rttlua_completion.sh.develspace.in +++ b/env-hooks/10.rttlua_completion.sh.develspace.in @@ -7,4 +7,4 @@ export LUA_PATH="$LUA_PATH;@CMAKE_CURRENT_SOURCE_DIR@/?.lua" if [ "x$LUA_CPATH" = "x" ]; then LUA_CPATH=";" fi -export LUA_CPATH="$LUA_CPATH;@CMAKE_CURRENT_SOURCE_DIR@/?.so" +export LUA_CPATH="$LUA_CPATH;@CMAKE_LIBRARY_OUTPUT_DIRECTORY@/?.so" From b6492425910e040530d72022b9b19f6cd400fc80 Mon Sep 17 00:00:00 2001 From: Gianni Borghesan Date: Mon, 26 Apr 2021 12:20:09 +0200 Subject: [PATCH 2/3] ros2 porting --- CMakeLists.txt | 14 +++++++------- env-hooks/10.rttlua_completion.sh.develspace.in | 10 ---------- env-hooks/rttlua_completion.sh.in | 10 ++++++++++ manifest.xml | 6 ------ package.xml | 6 +++++- 5 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 env-hooks/10.rttlua_completion.sh.develspace.in create mode 100644 env-hooks/rttlua_completion.sh.in delete mode 100644 manifest.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d37397..f846c78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ## ############# @@ -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/ ) + diff --git a/env-hooks/10.rttlua_completion.sh.develspace.in b/env-hooks/10.rttlua_completion.sh.develspace.in deleted file mode 100644 index cf9433e..0000000 --- a/env-hooks/10.rttlua_completion.sh.develspace.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -if [ "x$LUA_PATH" = "x" ]; then - LUA_PATH=";" -fi -export LUA_PATH="$LUA_PATH;@CMAKE_CURRENT_SOURCE_DIR@/?.lua" - -if [ "x$LUA_CPATH" = "x" ]; then - LUA_CPATH=";" -fi -export LUA_CPATH="$LUA_CPATH;@CMAKE_LIBRARY_OUTPUT_DIRECTORY@/?.so" diff --git a/env-hooks/rttlua_completion.sh.in b/env-hooks/rttlua_completion.sh.in new file mode 100644 index 0000000..e6509a8 --- /dev/null +++ b/env-hooks/rttlua_completion.sh.in @@ -0,0 +1,10 @@ +#!/bin/sh +if [ "x$LUA_PATH" = "x" ]; then + LUA_PATH=";" +fi +export LUA_PATH="$LUA_PATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/rttlua_completion/?.lua" + +if [ "x$LUA_CPATH" = "x" ]; then + LUA_CPATH=";" +fi +export LUA_CPATH="$LUA_CPATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/rttlua_completion/?.so" diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index dc796bf..0000000 --- a/manifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Markus Klotzbuecher, markus.klotzbuecher@mech.kuleuven.be - MIT - - diff --git a/package.xml b/package.xml index d8a2ba8..eb452c3 100644 --- a/package.xml +++ b/package.xml @@ -15,8 +15,12 @@ - catkin + ament_cmake ocl + + + ament_cmake + From a44e57b3d3664a7d1bce0386f703b4e1aca549fa Mon Sep 17 00:00:00 2001 From: Gianni Borghesan Date: Mon, 26 Apr 2021 13:40:15 +0200 Subject: [PATCH 3/3] removed unsed hook --- env-hooks/10.rttlua_completion.sh.installspace.in | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 env-hooks/10.rttlua_completion.sh.installspace.in diff --git a/env-hooks/10.rttlua_completion.sh.installspace.in b/env-hooks/10.rttlua_completion.sh.installspace.in deleted file mode 100644 index e6509a8..0000000 --- a/env-hooks/10.rttlua_completion.sh.installspace.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -if [ "x$LUA_PATH" = "x" ]; then - LUA_PATH=";" -fi -export LUA_PATH="$LUA_PATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/rttlua_completion/?.lua" - -if [ "x$LUA_CPATH" = "x" ]; then - LUA_CPATH=";" -fi -export LUA_CPATH="$LUA_CPATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/rttlua_completion/?.so"