Skip to content

Commit

Permalink
Upgrade the CMake version to 12
Browse files Browse the repository at this point in the history
  • Loading branch information
xxEoD2242 committed Jun 22, 2024
1 parent 2383b0a commit ec0d043
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 7 deletions.
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ if [ "$(uname)" == "Darwin" ]; then
export CXX="$(brew --prefix)/opt/llvm/bin/clang++"
else
if $gcc; then
export CC="gcc-8"
export CXX="g++-8"
export CC="gcc-12"
export CXX="g++-12"
else
export CC="clang-8"
export CXX="clang++-8"
export CC="clang-12"
export CXX="clang++-12"
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion cmake/cmake-modules/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ macro(CommonSetup)
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wno-documentation -Wno-unknown-warning-option ${CMAKE_CXX_FLAGS}")
find_package(LLVM REQUIRED CONFIG)
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -lc++fs -ferror-limit=10")
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -ferror-limit=10")
else()
set(CXX_EXP_LIB "-lstdc++fs -fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
endif ()
Expand Down
17 changes: 17 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Basic Dockerfile for testing compilation in Linux
FROM ubuntu:20.04

ENV TZ=America/Indiana/Indianapolis

RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN apt update && \
apt-get install -y \
git \
vim \
sudo

WORKDIR /root/workspace

CMD [ "/bin/bash" ]
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
site_name: AirSim
site_dir: build_docs
repo_url: https://github.com/microsoft/airsim
site_description: 'Open source simulator based on Unreal Engine for autonomous vehicles from Microsoft AI & Research'
site_description: 'Open source simulator based on Unreal Engine for autonomous vehicles from Codex Labs'

markdown_extensions:
- toc:
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ else #linux
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-get update
fi
sudo apt-get install -y clang-8 clang++-8 libc++-8-dev libc++abi-8-dev
sudo apt-get install -y clang-12 clang++-12 libc++-12-dev libc++abi-12-dev
fi

if ! which cmake; then
Expand Down

0 comments on commit ec0d043

Please sign in to comment.