p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove submodules and build ad-rss under Build folder

This commit is contained in:
Bernd Gassmann 2020-03-30 12:33:15 +02:00
parent 7ad35a9ec5
commit 808028db33
9 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitmodules vendored
View File

@ -1,9 +0,0 @@
[submodule "dependencies/ad-rss/src/spdlog"]
path = dependencies/ad-rss/src/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "dependencies/ad-rss/src/map"]
path = dependencies/ad-rss/src/map
url = https://github.com/carla-simulator/map
[submodule "dependencies/ad-rss/src/ad-rss-lib"]
path = dependencies/ad-rss/src/ad-rss-lib
url = https://github.com/intel/ad-rss-lib

5
Docs/rss_lib_integration.md
View File

@ -36,11 +36,6 @@ pip install --user pygccxml
pip install --user https://bitbucket.org/ompl/pyplusplus/get/1.8.1.zip
```
Remaining dependencies are part of the **dependencies/ad-rss** folder as GIT submodules. To properly fetch these, the submodules have to be updated and initialized.
```sh
git submodule update --init
```
Once this is done, the full set of dependencies and RSS components can be built calling the following.
_LibCarla_ with RSS has the be explicitly compiled by

80
Util/BuildTools/Ad-rss.sh
View File

@ -13,22 +13,70 @@ source $(dirname "$0")/Environment.sh
# -- Get and compile ad-rss -------------------------------------------
# ==============================================================================
pushd "${CARLA_ROOT_FOLDER}/dependencies/ad-rss" >/dev/null
ADRSS_BASENAME=ad-rss-3.0.0
ADRSS_INSTALL_DIR="${CARLA_BUILD_FOLDER}/${ADRSS_BASENAME}/install"
if [ "${CMAKE_PREFIX_PATH}" == "" ]; then
export CMAKE_PREFIX_PATH=${CARLA_BUILD_FOLDER}/boost-1.72.0-c8-install
if [[ -d "${ADRSS_INSTALL_DIR}" ]]; then
log "${ADRSS_BASENAME} already installed."
else
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${CARLA_BUILD_FOLDER}/boost-1.72.0-c8-install
# ad-rss is built inside a colcon workspace, therefore we have to setup the workspace first
mkdir -p "${CARLA_BUILD_FOLDER}/${ADRSS_BASENAME}/src"
log "Retrieving ${ADRSS_BASENAME}."
pushd "${CARLA_BUILD_FOLDER}/${ADRSS_BASENAME}/src" >/dev/null
git clone --depth=1 -b v1.x https://github.com/gabime/spdlog.git
git clone --depth=1 -b v2.0.0 https://github.com/carla-simulator/map
git clone --depth=1 -b v3.0.0 https://github.com/intel/ad-rss-lib
popd
cat >"${CARLA_BUILD_FOLDER}/${ADRSS_BASENAME}/colcon.meta" <<EOL
{
"names": {
"ad_physics": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_map_access": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_map_opendrive_reader": {
"cmake-args": ["-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_rss": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_rss_map_integration": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"spdlog": {
"cmake-args": ["-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
}
}
}
EOL
log "Compiling ${ADRSS_BASENAME}."
pushd "${CARLA_BUILD_FOLDER}/${ADRSS_BASENAME}" >/dev/null
if [ "${CMAKE_PREFIX_PATH}" == "" ]; then
export CMAKE_PREFIX_PATH=${CARLA_BUILD_FOLDER}/boost-1.72.0-c8-install
else
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${CARLA_BUILD_FOLDER}/boost-1.72.0-c8-install
fi
#after a fixing clang compile warnings and errors in components
# -DCMAKE_TOOLCHAIN_FILE=${CARLA_BUILD_FOLDER}/LibStdCppToolChain.cmake
colcon build --packages-up-to ad_rss_map_integration --cmake-args -DCMAKE_BUILD_TYPE=RelWithDebInfo
# ==============================================================================
# -- ...and we are done --------------------------------------------------------
# ==============================================================================
popd >/dev/null
log "Success!"
fi
#after a fixing clang compile warnings and errors in components
# -DCMAKE_TOOLCHAIN_FILE=${CARLA_BUILD_FOLDER}/LibStdCppToolChain.cmake
colcon build --packages-up-to ad_rss_map_integration --cmake-args -DCMAKE_BUILD_TYPE=RelWithDebInfo
# ==============================================================================
# -- ...and we are done --------------------------------------------------------
# ==============================================================================
popd >/dev/null
log "Success!"

2
Util/BuildTools/BuildLibCarla.sh
View File

@ -131,7 +131,7 @@ function build_libcarla {
M_TOOLCHAIN=${LIBSTDCPP_TOOLCHAIN_FILE}
M_BUILD_FOLDER=${LIBCARLA_BUILD_CLIENT_FOLDER}.rss.$(echo "$2" | tr '[:upper:]' '[:lower:]')
M_INSTALL_FOLDER=${LIBCARLA_INSTALL_CLIENT_FOLDER}
. "${CARLA_ROOT_FOLDER}/dependencies/ad-rss/install/setup.bash"
. "${CARLA_BUILD_FOLDER}/ad-rss-3.0.0/install/setup.bash"
CMAKE_EXTRA_OPTIONS="${CMAKE_EXTRA_OPTIONS:+${CMAKE_EXTRA_OPTIONS} }-DBUILD_RSS_VARIANT=ON"
else
fatal_error "Invalid build configuration \"$1\""

3
dependencies/ad-rss/.gitignore vendored
View File

@ -1,3 +0,0 @@
build/
install/
log/

22
dependencies/ad-rss/colcon.meta vendored
View File

@ -1,22 +0,0 @@
{
"names": {
"ad_physics": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_map_access": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_map_opendrive_reader": {
"cmake-args": ["-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_rss": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"ad_rss_map_integration": {
"cmake-args": ["-DBUILD_PYTHON_BINDING=ON", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
},
"spdlog": {
"cmake-args": ["-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DBUILD_SHARED_LIBS=OFF"]
}
}
}

1
dependencies/ad-rss/src/ad-rss-lib vendored

@ -1 +0,0 @@
Subproject commit eabf53da4c68549e079c4ab152f4c40ba6c98f65

1
dependencies/ad-rss/src/map vendored

@ -1 +0,0 @@
Subproject commit dc9ee91d2546b3f676882c82de63dfbddc8aff76

1
dependencies/ad-rss/src/spdlog vendored

@ -1 +0,0 @@
Subproject commit cca004efe4e66136a5f9f37e007d28a23bb729e0