diff --git a/roseus/CMakeLists.txt b/roseus/CMakeLists.txt index e732689e3..5de1baf90 100644 --- a/roseus/CMakeLists.txt +++ b/roseus/CMakeLists.txt @@ -162,10 +162,12 @@ install(DIRECTORY euslisp test scripts cmake include(cmake/roseus.cmake) -generate_eusdoc(euslisp/roseus.l "ROS") -generate_eusdoc(euslisp/roseus-utils.l) -generate_eusdoc(euslisp/eustf.l) -generate_eusdoc(euslisp/actionlib.l) +if(NOT DISABLE_DOCUMENTATION) + generate_eusdoc(euslisp/roseus.l "ROS") + generate_eusdoc(euslisp/roseus-utils.l) + generate_eusdoc(euslisp/eustf.l) + generate_eusdoc(euslisp/actionlib.l) +endif() if(CATKIN_ENABLE_TESTING) find_package(rostest REQUIRED) diff --git a/roseus/bin/roseus.in b/roseus/bin/roseus.in index 226ac48c7..a3b5e9ff0 100755 --- a/roseus/bin/roseus.in +++ b/roseus/bin/roseus.in @@ -4,8 +4,9 @@ set -e if [ "@APPLE@" = "1" ]; then EUSLISP_EXE=/usr/local/bin/irteusgl # osx else - EUSLISP_EXE=`find -L $EUSDIR -type f -name irteusgl` # linux + EUSLISP_EXE=$(which irteusgl || which irteusg) fi +if [ ! -e "$EUSLISP_EXE" ]; then echo "Could not found irteusgl program, please install/compile jskeus"; exit 1; fi ROSEUS_DIR=`rospack find roseus` ARG_STR=("(pushnew \"${ROSEUS_DIR}/euslisp/\" *load-path* :test #'equal)" \ ${ROSEUS_DIR}/euslisp/roseus.l ${ROSEUS_DIR}/euslisp/eustf.l ${ROSEUS_DIR}/euslisp/actionlib.l ${ROSEUS_DIR}/euslisp/roseus-utils.l)