Compile everything with C++14 standard
This commit is contained in:
parent
b7a13d08d6
commit
6eb73ada34
|
@ -11,7 +11,7 @@ process.
|
|||
|
||||

|
||||
|
||||
In Linux, we compile CARLA and all the dependencies with clang-5.0 and C++17
|
||||
In Linux, we compile CARLA and all the dependencies with clang-5.0 and C++14
|
||||
standard. We however link against different runtime C++ libraries depending on
|
||||
where the code going to be used, since all the code that is going to be linked
|
||||
with Unreal Engine needs to be compiled using `libc++`.
|
||||
|
|
|
@ -44,8 +44,8 @@ def get_libcarla_extensions():
|
|||
'dependencies/lib'],
|
||||
runtime_library_dirs=['/usr/local/lib/boost'],
|
||||
libraries=libraries,
|
||||
extra_compile_args=['-fPIC', '-std=c++17'],
|
||||
language='c++17',
|
||||
extra_compile_args=['-fPIC', '-std=c++14'],
|
||||
language='c++14',
|
||||
depends=depends)
|
||||
|
||||
return [make_extension('carla.libcarla', glob.glob('source/libcarla/*.cpp'))]
|
||||
|
|
|
@ -122,7 +122,7 @@ else
|
|||
pushd ${RPCLIB_BASENAME}-libcxx-build >/dev/null
|
||||
|
||||
cmake -G "Ninja" \
|
||||
-DCMAKE_CXX_FLAGS="-fPIC -std=c++17 -stdlib=libc++ -I${LLVM_INCLUDE} -Wl,-L${LLVM_LIBPATH}" \
|
||||
-DCMAKE_CXX_FLAGS="-fPIC -std=c++14 -stdlib=libc++ -I${LLVM_INCLUDE} -Wl,-L${LLVM_LIBPATH}" \
|
||||
-DCMAKE_INSTALL_PREFIX="../${RPCLIB_BASENAME}-libcxx-install" \
|
||||
../${RPCLIB_BASENAME}-source
|
||||
|
||||
|
@ -139,7 +139,7 @@ else
|
|||
pushd ${RPCLIB_BASENAME}-libstdcxx-build >/dev/null
|
||||
|
||||
cmake -G "Ninja" \
|
||||
-DCMAKE_CXX_FLAGS="-fPIC -std=c++17" \
|
||||
-DCMAKE_CXX_FLAGS="-fPIC -std=c++14" \
|
||||
-DCMAKE_INSTALL_PREFIX="../${RPCLIB_BASENAME}-libstdcxx-install" \
|
||||
../${RPCLIB_BASENAME}-source
|
||||
|
||||
|
@ -180,7 +180,7 @@ else
|
|||
pushd ${GTEST_BASENAME}-build >/dev/null
|
||||
|
||||
cmake -G "Ninja" \
|
||||
-DCMAKE_CXX_FLAGS="-std=c++17 -stdlib=libc++ -I${LLVM_INCLUDE} -Wl,-L${LLVM_LIBPATH}" \
|
||||
-DCMAKE_CXX_FLAGS="-std=c++14 -stdlib=libc++ -I${LLVM_INCLUDE} -Wl,-L${LLVM_LIBPATH}" \
|
||||
-DCMAKE_INSTALL_PREFIX="../${GTEST_BASENAME}-install" \
|
||||
../${GTEST_BASENAME}-source
|
||||
|
||||
|
@ -208,7 +208,7 @@ cat >${LIBSTDCPP_TOOLCHAIN_FILE}.gen <<EOL
|
|||
set(CMAKE_C_COMPILER ${CC})
|
||||
set(CMAKE_CXX_COMPILER ${CXX})
|
||||
|
||||
set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -std=c++17 -pthread -fPIC" CACHE STRING "" FORCE)
|
||||
set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -std=c++14 -pthread -fPIC" CACHE STRING "" FORCE)
|
||||
set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra" CACHE STRING "" FORCE)
|
||||
# See https://bugs.llvm.org/show_bug.cgi?id=21629
|
||||
set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -Wno-missing-braces" CACHE STRING "" FORCE)
|
||||
|
|
Loading…
Reference in New Issue