Include external dependencies as system to allow stricter warning checks

SebastianHuch · Apr 29, 2019 · 9e4925b · 9e4925b
1 parent 424c32d
commit 9e4925b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/Examples/CppClient/Makefile b/Examples/CppClient/Makefile
@@ -27,7 +27,7 @@ build: $(BINDIR)/cpp_client
 $(BINDIR)/cpp_client: build_libcarla
  $(call log,Compiling C++ Client...)
  @mkdir -p $(BINDIR)
- @$(CXX) $(CXXFLAGS) -I$(INSTALLDIR)/include -L$(INSTALLDIR)/lib \
+ @$(CXX) $(CXXFLAGS) -I$(INSTALLDIR)/include -isystem $(INSTALLDIR)/include/system -L$(INSTALLDIR)/lib \
  -o $(BINDIR)/cpp_client main.cpp \
  -Wl,-Bstatic -lcarla_client -lrpc -lboost_filesystem -Wl,-Bdynamic \
  -lpng -ltiff -ljpeg

diff --git a/LibCarla/cmake/client/CMakeLists.txt b/LibCarla/cmake/client/CMakeLists.txt
@@ -1,13 +1,14 @@
 cmake_minimum_required(VERSION 3.5.1)
 project(libcarla-client)
 
-# Install rpclib.
-install(DIRECTORY "${RPCLIB_INCLUDE_PATH}/rpc" DESTINATION include)
+# Install rpclib (install in system folder to avoid extra warnings).
+install(DIRECTORY "${RPCLIB_INCLUDE_PATH}/rpc" DESTINATION include/system)
 file(GLOB libcarla_carla_rpclib "${RPCLIB_LIB_PATH}/*.*")
 install(FILES ${libcarla_carla_rpclib} DESTINATION lib)
 
-# Install boost headers.
-install(DIRECTORY "${BOOST_INCLUDE_PATH}/boost" DESTINATION include)
+# Install boost headers (install in system folder to avoid extra warnings).
+# @todo Remove boost from public interface of LibCarla.client.
+install(DIRECTORY "${BOOST_INCLUDE_PATH}/boost" DESTINATION include/system)
 file(GLOB boost_libraries "${BOOST_LIB_PATH}/*")
 install(FILES ${boost_libraries} DESTINATION lib)
 
@@ -185,7 +186,7 @@ if (LIBCARLA_BUILD_RELEASE)
 
  add_library(carla_client STATIC ${libcarla_sources})
 
- target_include_directories(carla_client PRIVATE
+ target_include_directories(carla_client SYSTEM PRIVATE
  "${BOOST_INCLUDE_PATH}"
  "${RPCLIB_INCLUDE_PATH}")
 
@@ -206,7 +207,7 @@ if (LIBCARLA_BUILD_DEBUG)
 
  add_library(carla_client_debug STATIC ${libcarla_sources})
 
- target_include_directories(carla_client_debug PRIVATE
+ target_include_directories(carla_client_debug SYSTEM PRIVATE
  "${BOOST_INCLUDE_PATH}"
  "${RPCLIB_INCLUDE_PATH}")
 

diff --git a/LibCarla/cmake/server/CMakeLists.txt b/LibCarla/cmake/server/CMakeLists.txt
@@ -130,7 +130,7 @@ if (LIBCARLA_BUILD_RELEASE)
 
  add_library(carla_server STATIC ${libcarla_server_sources})
 
- target_include_directories(carla_server PRIVATE
+ target_include_directories(carla_server SYSTEM PRIVATE
  "${BOOST_INCLUDE_PATH}"
  "${RPCLIB_INCLUDE_PATH}")
 
@@ -144,7 +144,7 @@ if (LIBCARLA_BUILD_DEBUG)
 
  add_library(carla_server_debug STATIC ${libcarla_server_sources})
 
- target_include_directories(carla_server_debug PRIVATE
+ target_include_directories(carla_server_debug SYSTEM PRIVATE
  "${BOOST_INCLUDE_PATH}"
  "${RPCLIB_INCLUDE_PATH}")
 

diff --git a/LibCarla/cmake/test/CMakeLists.txt b/LibCarla/cmake/test/CMakeLists.txt
@@ -40,10 +40,12 @@ foreach(target ${build_targets})
  -DLIBCARLA_ENABLE_PROFILER
  -DLIBCARLA_WITH_GTEST)
 
- target_include_directories(${target} PRIVATE
+ target_include_directories(${target} SYSTEM PRIVATE
  "${BOOST_INCLUDE_PATH}"
  "${RPCLIB_INCLUDE_PATH}"
- "${GTEST_INCLUDE_PATH}"
+ "${GTEST_INCLUDE_PATH}")
+
+ target_include_directories(${target} PRIVATE
  "${libcarla_source_path}/test")
 
  if (WIN32)

diff --git a/PythonAPI/carla/setup.py b/PythonAPI/carla/setup.py
@@ -39,7 +39,8 @@ def walk(folder, file_filter='*'):
  os.path.join(pwd, 'dependencies/lib/libboost_filesystem.a'),
  os.path.join(pwd, 'dependencies/lib', pylib)]
  extra_compile_args = [
- '-fPIC', '-std=c++14', '-Wno-missing-braces',
+ '-isystem', 'dependencies/include/system',
+ '-fPIC', '-std=c++14', '-Werror', '-Wall', '-Wextra',
  '-DBOOST_ERROR_CODE_HEADER_ONLY', '-DLIBCARLA_WITH_PYTHON_SUPPORT'
  ]
  if 'TRAVIS' in os.environ and os.environ['TRAVIS'] == 'true':

diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
@@ -324,7 +324,7 @@ cp ${LIBSTDCPP_TOOLCHAIN_FILE}.gen ${LIBCPP_TOOLCHAIN_FILE}.gen
 cat >>${LIBCPP_TOOLCHAIN_FILE}.gen <<EOL
 
 set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -stdlib=libc++" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -I${LLVM_INCLUDE}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -isystem ${LLVM_INCLUDE}" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti" CACHE STRING "" FORCE)
 set(CMAKE_CXX_LINK_FLAGS "\${CMAKE_CXX_LINK_FLAGS} -L${LLVM_LIBPATH}" CACHE STRING "" FORCE)
 set(CMAKE_CXX_LINK_FLAGS "\${CMAKE_CXX_LINK_FLAGS} -lc++ -lc++abi" CACHE STRING "" FORCE)