From 4f22b12ec61aba56c921e9a16dec3638bb2bab6e Mon Sep 17 00:00:00 2001 From: asarium Date: Fri, 13 Apr 2018 15:06:16 +0200 Subject: [PATCH] Mark all external libraries as system includes --- cmake/util.cmake | 2 +- code/cfile/cfile.h | 2 +- code/globalincs/pstypes.h | 6 +++--- code/math/floating.h | 2 ++ code/windows_stub/config.h | 2 +- lib/jansson/CMakeLists.txt | 2 +- lib/libpng/CMakeLists.txt | 2 +- lib/libsdl/CMakeLists.txt | 2 +- lib/md5/CMakeLists.txt | 2 +- lib/opengl/gl/CMakeLists.txt | 4 ++-- lib/zlib/CMakeLists.txt | 2 +- test/gtest/CMakeLists.txt | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/cmake/util.cmake b/cmake/util.cmake index cb59c95e91..0ab070beec 100644 --- a/cmake/util.cmake +++ b/cmake/util.cmake @@ -10,7 +10,7 @@ FUNCTION(ADD_IMPORTED_LIB NAME INCLUDES LIBS) target_link_libraries(${NAME} INTERFACE "${LIBS}") - target_include_directories(${NAME} INTERFACE "${INCLUDES}") + target_include_directories(${NAME} SYSTEM INTERFACE "${INCLUDES}") ENDFUNCTION(ADD_IMPORTED_LIB) MACRO(PKG_CONFIG_LIB_RESOLVE NAME OUTVAR) diff --git a/code/cfile/cfile.h b/code/cfile/cfile.h index 4c2a2a2741..42ff54515e 100644 --- a/code/cfile/cfile.h +++ b/code/cfile/cfile.h @@ -13,7 +13,7 @@ #define __CFILE_H__ -#include +#include #include "globalincs/pstypes.h" #include diff --git a/code/globalincs/pstypes.h b/code/globalincs/pstypes.h index ea8d9b7d5d..702d88549d 100644 --- a/code/globalincs/pstypes.h +++ b/code/globalincs/pstypes.h @@ -19,10 +19,10 @@ #include "globalincs/toolchain.h" #include "utils/strings.h" -#include // For NULL, etc -#include +#include // For NULL, etc +#include #include -#include +#include #include #include diff --git a/code/math/floating.h b/code/math/floating.h index c62d3d549e..afc9ac75ed 100644 --- a/code/math/floating.h +++ b/code/math/floating.h @@ -18,6 +18,8 @@ #include "globalincs/pstypes.h" +#include + extern float frand(); extern int rand_chance(float frametime, float chance = 1.0f); float frand_range(float min, float max); diff --git a/code/windows_stub/config.h b/code/windows_stub/config.h index a2dc2619a2..4ce4a51f92 100644 --- a/code/windows_stub/config.h +++ b/code/windows_stub/config.h @@ -5,7 +5,7 @@ #ifndef _CONFIG_H #define _CONFIG_H -#include +#include #include diff --git a/lib/jansson/CMakeLists.txt b/lib/jansson/CMakeLists.txt index aaaec02601..84c62fc5f2 100644 --- a/lib/jansson/CMakeLists.txt +++ b/lib/jansson/CMakeLists.txt @@ -312,7 +312,7 @@ IF(FSO_BUILD_INCLUDED_LIBS OR NOT JANSSON_FOUND) set_target_properties(jansson PROPERTIES FOLDER "3rdparty") - target_include_directories(jansson PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include) + target_include_directories(jansson SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include) target_include_directories(jansson PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/private_include) target_link_libraries(jansson PUBLIC compiler) endif() diff --git a/lib/libpng/CMakeLists.txt b/lib/libpng/CMakeLists.txt index 1c2c938b16..2a445353df 100644 --- a/lib/libpng/CMakeLists.txt +++ b/lib/libpng/CMakeLists.txt @@ -38,7 +38,7 @@ IF (FSO_BUILD_INCLUDED_LIBS OR NOT PNG_FOUND) PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL # This will only be defined if we are building a shared library ) - target_include_directories(png PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(png SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_compile_definitions(png PRIVATE "_CRT_SECURE_NO_WARNINGS;$<$:PNG_DEBUG=1>") diff --git a/lib/libsdl/CMakeLists.txt b/lib/libsdl/CMakeLists.txt index 30f9d142f7..4d336c0140 100644 --- a/lib/libsdl/CMakeLists.txt +++ b/lib/libsdl/CMakeLists.txt @@ -35,7 +35,7 @@ elseif(PLATFORM_MAC) find_library(SDL2_LIBRARY SDL2 PATHS "${PREBUILT_PATH}" NO_DEFAULT_PATH) target_link_libraries(sdl2 INTERFACE "${SDL2_LIBRARY}") - target_include_directories(sdl2 INTERFACE "${SDL2_LIBRARY}/Headers") + target_include_directories(sdl2 SYSTEM INTERFACE "${SDL2_LIBRARY}/Headers") add_target_copy_files("${SDL2_LIBRARY}") INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README-SDL.txt" diff --git a/lib/md5/CMakeLists.txt b/lib/md5/CMakeLists.txt index 97f9219ce3..fa2db8f7a6 100644 --- a/lib/md5/CMakeLists.txt +++ b/lib/md5/CMakeLists.txt @@ -5,7 +5,7 @@ SET(MD5_SOURCES ADD_LIBRARY(md5 STATIC ${MD5_SOURCES}) -target_include_directories(md5 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") +target_include_directories(md5 SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") # Disable warnings if building from source suppress_warnings(md5) diff --git a/lib/opengl/gl/CMakeLists.txt b/lib/opengl/gl/CMakeLists.txt index f806a2dcec..dee8985966 100644 --- a/lib/opengl/gl/CMakeLists.txt +++ b/lib/opengl/gl/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(glad STATIC "glad/include/glad/glad.h" "glad/include/KHR/khrplatform.h" "glad/src/glad.c") -target_include_directories(glad PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/glad/include") +target_include_directories(glad SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/glad/include") set_target_properties(glad PROPERTIES FOLDER "3rdparty") if (MSVC) # Suppress some warnings @@ -19,7 +19,7 @@ if (WIN32) "glad_wgl/include/glad/glad_wgl.h" "glad_wgl/include/KHR/khrplatform.h" "glad_wgl/src/glad_wgl.c") - target_include_directories(glad_wgl PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/glad_wgl/include") + target_include_directories(glad_wgl SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/glad_wgl/include") set_target_properties(glad_wgl PROPERTIES FOLDER "3rdparty") target_link_libraries(glad_wgl PUBLIC glad) if (MSVC) diff --git a/lib/zlib/CMakeLists.txt b/lib/zlib/CMakeLists.txt index c3f438c50a..c31135290c 100644 --- a/lib/zlib/CMakeLists.txt +++ b/lib/zlib/CMakeLists.txt @@ -31,7 +31,7 @@ IF (FSO_BUILD_INCLUDED_LIBS OR NOT ZLIB_FOUND) ADD_LIBRARY(zlib ${ZLIB_SOURCES}) - target_include_directories(zlib PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") + target_include_directories(zlib SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") set_target_properties(zlib PROPERTIES diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt index c821933243..e56c7bcb07 100644 --- a/test/gtest/CMakeLists.txt +++ b/test/gtest/CMakeLists.txt @@ -93,7 +93,7 @@ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) # to the targets for when we are part of a parent build (ie being pulled # in via add_subdirectory() rather than being a standalone build). if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest INTERFACE "${gtest_SOURCE_DIR}/include") + target_include_directories(gtest SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") endif() ########################################################################