Reintroduce gcc for ROS2 (#7694)
This commit is contained in:
parent
0327df1fd5
commit
7c800a5b7f
|
@ -134,6 +134,18 @@ carla_string_option (
|
|||
"png"
|
||||
)
|
||||
|
||||
carla_string_option (
|
||||
GXX_COMPILER
|
||||
"g++ compiler used by some CARLA extensions."
|
||||
/usr/bin/g++-12
|
||||
)
|
||||
|
||||
carla_string_option (
|
||||
GCC_COMPILER
|
||||
"gcc compiler used by some CARLA extensions."
|
||||
/usr/bin/gcc-12
|
||||
)
|
||||
|
||||
|
||||
|
||||
# ================================
|
||||
|
|
|
@ -5,7 +5,13 @@ project (carla-ros2-native-project)
|
|||
include (ExternalProject)
|
||||
|
||||
set (PROJECT_INSTALL_PATH ${CMAKE_CURRENT_BINARY_DIR}/install)
|
||||
set (PROJECT_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE=-D_GLIBCXX_USE_CXX11_ABI=0 -DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH})
|
||||
set (PROJECT_CMAKE_FLAGS
|
||||
-DCMAKE_CXX_COMPILER=${GXX_COMPILER}
|
||||
-DCMAKE_C_COMPILER=${GCC_COMPILER}
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
-DCMAKE_CXX_FLAGS_RELEASE=-D_GLIBCXX_USE_CXX11_ABI=0
|
||||
-DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH}
|
||||
)
|
||||
|
||||
ExternalProject_add (
|
||||
foonathan_memory
|
||||
|
|
30
Setup.sh
30
Setup.sh
|
@ -42,7 +42,27 @@ then
|
|||
sudo apt-get install retry
|
||||
fi
|
||||
retry --until=success --times=12 --delay=300 -- sudo apt-get update
|
||||
retry --until=success --times=12 --delay=300 -- sudo apt-get install build-essential make ninja-build libvulkan1 python3 python3-dev python3-pip libpng-dev libtiff5-dev libjpeg-dev tzdata sed curl libtool rsync libxml2-dev git git-lfs
|
||||
retry --until=success --times=12 --delay=300 -- sudo apt-get -y install \
|
||||
build-essential \
|
||||
g++-12 \
|
||||
gcc-12 \
|
||||
make \
|
||||
ninja-build \
|
||||
libvulkan1 \
|
||||
python3 \
|
||||
python3-dev \
|
||||
python3-pip \
|
||||
libpng-dev \
|
||||
libtiff5-dev \
|
||||
libjpeg-dev \
|
||||
tzdata \
|
||||
sed \
|
||||
curl \
|
||||
libtool \
|
||||
rsync \
|
||||
libxml2-dev \
|
||||
git \
|
||||
git-lfs
|
||||
echo "Ubuntu Pacakges Installed..."
|
||||
|
||||
echo "Installing Python Pacakges..."
|
||||
|
@ -103,7 +123,13 @@ popd
|
|||
popd
|
||||
|
||||
echo "Configuring CARLA..."
|
||||
retry --until=success --times=10 -- cmake -G Ninja -S . -B Build --toolchain=$PWD/CMake/LinuxToolchain.cmake -DLAUNCH_ARGS="-prefernvidia" -DCMAKE_BUILD_TYPE=Release -DENABLE_ROS2=ON -DBUILD_CARLA_UNREAL=ON -DCARLA_UNREAL_ENGINE_PATH=$CARLA_UNREAL_ENGINE_PATH
|
||||
retry --until=success --times=10 -- cmake -G Ninja -S . -B Build \
|
||||
--toolchain=$PWD/CMake/LinuxToolchain.cmake \
|
||||
-DLAUNCH_ARGS="-prefernvidia" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DENABLE_ROS2=ON \
|
||||
-DBUILD_CARLA_UNREAL=ON \
|
||||
-DCARLA_UNREAL_ENGINE_PATH=$CARLA_UNREAL_ENGINE_PATH
|
||||
echo "Building CARLA..."
|
||||
retry --until=success --times=10 -- cmake --build Build
|
||||
echo "Installing PythonAPI..."
|
||||
|
|
Loading…
Reference in New Issue