Merge branch 'master' into fix_win32_compilation
This commit is contained in:
commit
6be72dd26a
|
@ -30,9 +30,9 @@ matrix:
|
|||
- pip3 install -q --user setuptools nose2
|
||||
script:
|
||||
- while sleep 2m; do echo "still building..."; done &
|
||||
- make setup > build.log 2>&1
|
||||
- make LibCarla > build.log 2>&1
|
||||
- make PythonAPI > build.log 2>&1
|
||||
- make setup >> build.log 2>&1
|
||||
- make LibCarla >> build.log 2>&1
|
||||
- make PythonAPI >> build.log 2>&1
|
||||
- kill %1
|
||||
- make check ARGS="--all --gtest_args=--gtest_filter=-*_mt"
|
||||
after_failure:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.9.0)
|
||||
cmake_minimum_required(VERSION 3.5.1)
|
||||
project(CARLA)
|
||||
|
||||
include("Build/CMakeLists.txt.in")
|
||||
|
|
|
@ -12,10 +12,6 @@ sudo apt-get install build-essential clang-5.0 lld-5.0 g++-7 ninja-build python
|
|||
pip install --user setuptools nose2
|
||||
```
|
||||
|
||||
Note that some dependencies require **CMake 3.9** or later installed in your
|
||||
machine, you can retrieve the latest version from the
|
||||
[CMake download page][cmakelink].
|
||||
|
||||
To avoid compatibility issues between Unreal Engine and the CARLA dependencies,
|
||||
the best configuration is to compile everything with the same compiler version
|
||||
and C++ runtime library. We use clang 5.0 and LLVM's libc++. We recommend to
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.9.0)
|
||||
cmake_minimum_required(VERSION 3.5.1)
|
||||
project(libcarla)
|
||||
|
||||
message(STATUS "Building ${PROJECT_NAME} version ${CARLA_VERSION}")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.9.0)
|
||||
cmake_minimum_required(VERSION 3.5.1)
|
||||
project(libcarla-client)
|
||||
|
||||
# Install rpclib.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.9.0)
|
||||
cmake_minimum_required(VERSION 3.5.1)
|
||||
project(libcarla-server)
|
||||
|
||||
# Install libc++ shared libraries.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.9.0)
|
||||
cmake_minimum_required(VERSION 3.5.1)
|
||||
project(libcarla-unit-tests)
|
||||
|
||||
file(GLOB_RECURSE libcarla_test_sources
|
||||
|
|
|
@ -149,6 +149,10 @@ else
|
|||
|
||||
log "Building rpclib with libc++."
|
||||
|
||||
# rpclib does not use any cmake 3.9 feature.
|
||||
# As cmake 3.9 is not standard in Ubuntu 16.04, change cmake version to 3.5
|
||||
sed -i s/"3.9.0"/"3.5.0"/g ${RPCLIB_BASENAME}-source/CMakeLists.txt
|
||||
|
||||
mkdir -p ${RPCLIB_BASENAME}-libcxx-build
|
||||
|
||||
pushd ${RPCLIB_BASENAME}-libcxx-build >/dev/null
|
||||
|
|
Loading…
Reference in New Issue