From ec0d04383c47b925c21fea4a1734cb1f963e981d Mon Sep 17 00:00:00 2001 From: Tyler Fedrizzi Date: Sat, 22 Jun 2024 18:23:31 -0400 Subject: [PATCH] Upgrade the CMake version to 12 --- build.sh | 8 ++++---- cmake/cmake-modules/CommonSetup.cmake | 2 +- docker/Dockerfile | 17 +++++++++++++++++ mkdocs.yml | 2 +- setup.sh | 2 +- 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 docker/Dockerfile diff --git a/build.sh b/build.sh index 8b45d64ba1..9d9fb85cef 100755 --- a/build.sh +++ b/build.sh @@ -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 diff --git a/cmake/cmake-modules/CommonSetup.cmake b/cmake/cmake-modules/CommonSetup.cmake index 11d0c9bcb2..e5c6cfbb3b 100644 --- a/cmake/cmake-modules/CommonSetup.cmake +++ b/cmake/cmake-modules/CommonSetup.cmake @@ -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 () diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000000..3c92901418 --- /dev/null +++ b/docker/Dockerfile @@ -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" ] \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index cf25e6817f..9e94b8a27b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -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: diff --git a/setup.sh b/setup.sh index c2818fb006..47cc03e81b 100755 --- a/setup.sh +++ b/setup.sh @@ -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