Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[euscollada] add 'condition="$ROS_DISTRO != debian"' to test_depend #259

Merged
merged 3 commits into from
Jan 9, 2025
Merged

[euscollada] add 'condition="$ROS_DISTRO != debian"' to test_depend #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cab457b
euscollada: package.xml convert to format 3
k-okada Jan 8, 2025
5348537
euscollada: package.xml openhrp3 is not released on ROS-O system, so …
k-okada Jan 8, 2025
cef525c
eus_assimp/eusurdf: update CMakeLists.txt to use system installed eus…
k-okada Jan 8, 2025
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
18 changes: 15 additions & 3 deletions eus_assimp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,34 @@ project(eus_assimp)

# Load catkin and all dependencies required for this package
# TODO: remove all from COMPONENTS that are not catkin packages.
find_package(catkin REQUIRED COMPONENTS euslisp)
find_package(catkin REQUIRED COMPONENTS)

set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CATKIN_DEVEL_PREFIX}/lib/pkgconfig")

find_package(PkgConfig)
pkg_check_modules(assimpdevel assimp_devel REQUIRED)
# CATKIN_MIGRATION: removed during catkin migration
# rosbuild_add_boost_directories()
find_package(euslisp QUIET)
find_program(EUS_EXECUTABLE eus)
if(NOT euslisp_INCLUDE_DIRS)
if(EXISTS ${euslisp_SOURCE_DIR}/jskeus)
set(euslisp_PACKAGE_PATH ${euslisp_SOURCE_DIR})
else()
elseif(EXISTS ${euslisp_PREFIX}/share/euslisp)
set(euslisp_PACKAGE_PATH ${euslisp_PREFIX}/share/euslisp)
elseif((EXISTS "${EUS_EXECUTABLE}") AND (EXISTS "/usr/share/euslisp/include")) # euslisp not found as ROS package, try to find endif()
set(euslisp_PACKAGE_PATH /usr/share/euslisp)
else()
message(FATAL_ERROR "-- Could not find euslisp_PACKAGE_PATH")
endif()
message("-- Set euslisp_PACKAGE_PATH to ${euslisp_PACKAGE_PATH}")
set(euslisp_INCLUDE_DIRS ${euslisp_PACKAGE_PATH}/jskeus/eus/include)
if(EXISTS ${euslisp_PACKAGE_PATH}/jskeus/eus/include)
set(euslisp_INCLUDE_DIRS ${euslisp_PACKAGE_PATH}/jskeus/eus/include)
elseif(EXISTS ${euslisp_PACKAGE_PATH}/include)
set(euslisp_INCLUDE_DIRS ${euslisp_PACKAGE_PATH}/include)
else()
message(FATAL_ERROR "-- Could not find euslisp_INCLUDE_DIRS")
endif()
endif()
message("-- Set euslisp_INCLUDE_DIRS to ${euslisp_INCLUDE_DIRS}")
include_directories(/usr/include /usr/X11R6/include ${euslisp_INCLUDE_DIRS} ${assimpdevel_INCLUDE_DIRS})
Expand Down
36 changes: 18 additions & 18 deletions euscollada/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>euscollada</name>
<version>0.4.5</version>
<description>euscollada</description>
Expand Down Expand Up @@ -34,23 +34,23 @@
<build_depend>collada_urdf</build_depend>
<build_depend>rostest</build_depend>

<run_depend>roscpp</run_depend>
<run_depend>rospack</run_depend>
<run_depend>yaml-cpp</run_depend>
<run_depend>assimp_devel</run_depend>
<run_depend>urdf</run_depend>
<run_depend>liburdfdom-dev</run_depend> <!-- for indigo -->
<run_depend>resource_retriever</run_depend>
<run_depend>collada-dom</run_depend>
<run_depend>collada_parser</run_depend>
<run_depend>libqhull</run_depend>
<run_depend>tf</run_depend>
<run_depend>collada_urdf</run_depend>
<run_depend>rostest</run_depend>

<test_depend>roseus</test_depend>
<test_depend>openhrp3</test_depend>
<test_depend>pr2_description</test_depend>
<exec_depend>roscpp</exec_depend>
<exec_depend>rospack</exec_depend>
<exec_depend>yaml-cpp</exec_depend>
<exec_depend>assimp_devel</exec_depend>
<exec_depend>urdf</exec_depend>
<exec_depend>liburdfdom-dev</exec_depend> <!-- for indigo -->
<exec_depend>resource_retriever</exec_depend>
<exec_depend>collada-dom</exec_depend>
<exec_depend>collada_parser</exec_depend>
<exec_depend>libqhull</exec_depend>
<exec_depend>tf</exec_depend>
<exec_depend>collada_urdf</exec_depend>
<exec_depend>rostest</exec_depend>

<test_depend condition="$ROS_DISTRO != debian">roseus</test_depend>
<test_depend condition="$ROS_DISTRO != debian">openhrp3</test_depend>
<test_depend condition="$ROS_DISTRO != debian">pr2_description</test_depend>

<export>
<rosdoc config="rosdoc.yaml"/>
Expand Down
8 changes: 7 additions & 1 deletion eusurdf/cmake/eusurdf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,21 @@ endmacro(get_collada_to_urdf_exe _collada_to_urdf_exe)

macro(get_eusdir _eusdir_var)
find_package(euslisp QUIET)
find_program(EUS_EXECUTABLE eus)
if(euslisp_FOUND)
set(${_eusdir_var} "${EUSDIR}")
elseif(NOT "$ENV{EUSDIR}" STREQUAL "")
set(${_eusdir_var} "$ENV{EUSDIR}")
elseif((EXISTS "${EUS_EXECUTABLE}") AND (EXISTS "/usr/share/euslisp")) # euslisp not found as ROS package, try to find system installed eus
set(${_eusdir_var} "/usr/share/euslisp")
else(euslisp_FOUND)
message(FATAL_ERROR "EUSDIR could not detected.")
endif(euslisp_FOUND)
message(STATUS "Found EUSDIR: ${${_eusdir_var}}")
endmacro(get_eusdir _eusdir_var)

macro(get_eusexe _eus_exe)
find_package(euslisp REQUIRED)
find_package(euslisp QUIET)
if(${CMAKE_SYSTEM_NAME} MATCHES Linux)
execute_process(COMMAND gcc -dumpmachine OUTPUT_VARIABLE GCC_MACHINE OUTPUT_STRIP_TRAILING_WHITESPACE)
message("-- Set GCC_MACHINE to ${GCC_MACHINE}")
Expand All @@ -58,12 +61,15 @@ macro(get_eusexe _eus_exe)
set(ARCHDIR Generic)
endif()

find_program(JSKEUS_EXECUTABLE irteusgl)
if (EXISTS ${euslisp_SOURCE_DIR}/jskeus/eus/${ARCHDIR}/bin/irteusgl)
set(${_eus_exe} ${euslisp_SOURCE_DIR}/jskeus/eus/${ARCHDIR}/bin/irteusgl)
elseif (EXISTS ${euslisp_SOURCE_PREFIX}/jskeus/eus/${ARCHDIR}/bin/irteusgl)
set(${_eus_exe} ${euslisp_SOURCE_PREFIX}/jskeus/eus/${ARCHDIR}/bin/irteusgl)
elseif (EXISTS ${euslisp_PREFIX}/share/euslisp/jskeus/eus/${ARCHDIR}/bin/irteusgl)
set(${_eus_exe} ${euslisp_PREFIX}/share/euslisp/jskeus/eus/${ARCHDIR}/bin/irteusgl)
elseif (EXISTS "${JSKEUS_EXECUTABLE}")
set(${_eus_exe} ${JSKEUS_EXECUTABLE})
else (EXISTS ${euslisp_SOURCE_DIR}/jskeus/eus/${ARCHDIR}/bin/irteusgl)
message(FATAL_ERROR "cannot find irteusgl")
endif(EXISTS ${euslisp_SOURCE_DIR}/jskeus/eus/${ARCHDIR}/bin/irteusgl)
Expand Down
Loading