Skip to content
This repository has been archived by the owner on Feb 3, 2025. It is now read-only.

Fix setup.sh and install dirs with absolute paths #3138

Merged
merged 1 commit into from
Dec 2, 2021
Merged

Fix setup.sh and install dirs with absolute paths #3138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,24 +168,26 @@ message (STATUS "----------------------------------------\n")
# 1. In CMake code to pass preprocessor definitions to certain source files
# (especially in common/CMakeLists.txt).
# 2. In the generation of cmake/setup.sh from cmake/setup.sh.in
include (${gazebo_cmake_dir}/JoinPaths.cmake)
set(GAZEBO_DEFAULT_MASTER_HOST localhost)
set(GAZEBO_DEFAULT_MASTER_PORT 11345)
set(GAZEBO_RELATIVE_PLUGIN_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/plugins)
set(GAZEBO_RELATIVE_PLUGIN_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/plugins)
set(GAZEBO_PLUGIN_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${GAZEBO_RELATIVE_PLUGIN_LIB_INSTALL_DIR})
set(GAZEBO_PLUGIN_BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${GAZEBO_RELATIVE_PLUGIN_BIN_INSTALL_DIR})
join_paths(GAZEBO_SETUP_SH_PLUGIN_LIB_INSTALL_DIR "\${installPrefix}" ${CMAKE_INSTALL_LIBDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/plugins)
join_paths(GAZEBO_SETUP_SH_PLUGIN_BIN_INSTALL_DIR "\${installPrefix}" ${CMAKE_INSTALL_BINDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/plugins)
set(GAZEBO_PLUGIN_LIB_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/plugins)
set(GAZEBO_PLUGIN_BIN_INSTALL_DIR ${CMAKE_INSTALL_FULL_BINDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/plugins)
if(WIN32)
set(GAZEBO_RELATIVE_PLUGIN_PATH ${GAZEBO_RELATIVE_PLUGIN_BIN_INSTALL_DIR})
set(GAZEBO_SETUP_SH_PLUGIN_PATH ${GAZEBO_SETUP_SH_PLUGIN_BIN_INSTALL_DIR})
set(GAZEBO_PLUGIN_PATH ${GAZEBO_PLUGIN_BIN_INSTALL_DIR})
else()
set(GAZEBO_RELATIVE_PLUGIN_PATH ${GAZEBO_RELATIVE_PLUGIN_LIB_INSTALL_DIR})
set(GAZEBO_SETUP_SH_PLUGIN_PATH ${GAZEBO_SETUP_SH_PLUGIN_LIB_INSTALL_DIR})
set(GAZEBO_PLUGIN_PATH ${GAZEBO_PLUGIN_LIB_INSTALL_DIR})
endif()
set(GAZEBO_PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${GAZEBO_RELATIVE_PLUGIN_PATH})
FILE(TO_NATIVE_PATH "${GAZEBO_PLUGIN_PATH}" GAZEBO_PLUGIN_PATH)
set(GAZEBO_RELATIVE_MODEL_PATH ${CMAKE_INSTALL_DATAROOTDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/models)
set(GAZEBO_MODEL_PATH ${CMAKE_INSTALL_PREFIX}/${GAZEBO_RELATIVE_MODEL_PATH})
join_paths(GAZEBO_SETUP_SH_MODEL_PATH "\${installPrefix}" ${CMAKE_INSTALL_DATAROOTDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/models)
set(GAZEBO_MODEL_PATH ${CMAKE_INSTALL_FULL_DATAROOTDIR}/gazebo-${GAZEBO_MAJOR_VERSION}/models)
FILE(TO_NATIVE_PATH "${GAZEBO_MODEL_PATH}" GAZEBO_MODEL_PATH)
set(GAZEBO_RELATIVE_RESOURCE_PATH ${CMAKE_INSTALL_DATAROOTDIR}/gazebo-${GAZEBO_MAJOR_VERSION})
set(GAZEBO_RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/${GAZEBO_RELATIVE_RESOURCE_PATH})
join_paths(GAZEBO_SETUP_SH_RESOURCE_PATH "\${installPrefix}" ${CMAKE_INSTALL_DATAROOTDIR}/gazebo-${GAZEBO_MAJOR_VERSION})
set(GAZEBO_RESOURCE_PATH ${CMAKE_INSTALL_FULL_DATAROOTDIR}/gazebo-${GAZEBO_MAJOR_VERSION})
FILE(TO_NATIVE_PATH "${GAZEBO_RESOURCE_PATH}" GAZEBO_RESOURCE_PATH)
set(GAZEBO_MODEL_DATABASE_URI http://models.gazebosim.org)
set(OGRE_RESOURCE_PATH ${OGRE_PLUGINDIR})
Expand Down Expand Up @@ -428,7 +430,6 @@ else (build_errors)
set (Boost_PKGCONFIG_LIBS "${Boost_PKGCONFIG_LIBS} ${bname}")
endforeach(b)

include(${gazebo_cmake_dir}/JoinPaths.cmake)
join_paths(pkgconfig_libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
join_paths(pkgconfig_includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")

Expand Down
10 changes: 5 additions & 5 deletions cmake/setup.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ if [ ! -d "${installPrefix}" ]; then
echo "The install prefix ${installPrefix} does not exist."
unset installPrefix
return 1
elif [ ! -f "${installPrefix}/@GAZEBO_RELATIVE_RESOURCE_PATH@/setup.sh" ]; then
echo "The install prefix ${installPrefix}/@GAZEBO_RELATIVE_RESOURCE_PATH@ does not contain setup.sh."
elif [ ! -f "@GAZEBO_SETUP_SH_RESOURCE_PATH@/setup.sh" ]; then
echo "The install prefix @GAZEBO_SETUP_SH_RESOURCE_PATH@ does not contain setup.sh."
unset installPrefix
return 1
fi

export GAZEBO_MASTER_URI=${GAZEBO_MASTER_URI:-http://@GAZEBO_DEFAULT_MASTER_HOST@:@GAZEBO_DEFAULT_MASTER_PORT@}
export GAZEBO_MODEL_DATABASE_URI=@GAZEBO_MODEL_DATABASE_URI@
export GAZEBO_RESOURCE_PATH=${installPrefix}/@GAZEBO_RELATIVE_RESOURCE_PATH@:${GAZEBO_RESOURCE_PATH}
export GAZEBO_PLUGIN_PATH=${installPrefix}/@GAZEBO_RELATIVE_PLUGIN_PATH@:${GAZEBO_PLUGIN_PATH}
export GAZEBO_MODEL_PATH=${installPrefix}/@GAZEBO_RELATIVE_MODEL_PATH@:${GAZEBO_MODEL_PATH}
export GAZEBO_RESOURCE_PATH=@GAZEBO_SETUP_SH_RESOURCE_PATH@:${GAZEBO_RESOURCE_PATH}
export GAZEBO_PLUGIN_PATH=@GAZEBO_SETUP_SH_PLUGIN_PATH@:${GAZEBO_PLUGIN_PATH}
export GAZEBO_MODEL_PATH=@GAZEBO_SETUP_SH_MODEL_PATH@:${GAZEBO_MODEL_PATH}
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@GAZEBO_PLUGIN_PATH@
export OGRE_RESOURCE_PATH=@OGRE_RESOURCE_PATH@

Expand Down