Skip to content

Commit ec0d043

Browse files
committed
Upgrade the CMake version to 12
1 parent 2383b0a commit ec0d043

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ if [ "$(uname)" == "Darwin" ]; then
6464
export CXX="$(brew --prefix)/opt/llvm/bin/clang++"
6565
else
6666
if $gcc; then
67-
export CC="gcc-8"
68-
export CXX="g++-8"
67+
export CC="gcc-12"
68+
export CXX="g++-12"
6969
else
70-
export CC="clang-8"
71-
export CXX="clang++-8"
70+
export CC="clang-12"
71+
export CXX="clang++-12"
7272
fi
7373
fi
7474

cmake/cmake-modules/CommonSetup.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ macro(CommonSetup)
5959
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
6060
set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wno-documentation -Wno-unknown-warning-option ${CMAKE_CXX_FLAGS}")
6161
find_package(LLVM REQUIRED CONFIG)
62-
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -lc++fs -ferror-limit=10")
62+
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -ferror-limit=10")
6363
else()
6464
set(CXX_EXP_LIB "-lstdc++fs -fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
6565
endif ()

docker/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Basic Dockerfile for testing compilation in Linux
2+
FROM ubuntu:20.04
3+
4+
ENV TZ=America/Indiana/Indianapolis
5+
6+
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
7+
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
8+
9+
RUN apt update && \
10+
apt-get install -y \
11+
git \
12+
vim \
13+
sudo
14+
15+
WORKDIR /root/workspace
16+
17+
CMD [ "/bin/bash" ]

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
site_name: AirSim
22
site_dir: build_docs
33
repo_url: https://github.com/microsoft/airsim
4-
site_description: 'Open source simulator based on Unreal Engine for autonomous vehicles from Microsoft AI & Research'
4+
site_description: 'Open source simulator based on Unreal Engine for autonomous vehicles from Codex Labs'
55

66
markdown_extensions:
77
- toc:

setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ else #linux
6060
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
6161
sudo apt-get update
6262
fi
63-
sudo apt-get install -y clang-8 clang++-8 libc++-8-dev libc++abi-8-dev
63+
sudo apt-get install -y clang-12 clang++-12 libc++-12-dev libc++abi-12-dev
6464
fi
6565

6666
if ! which cmake; then

0 commit comments

Comments
 (0)