Skip to content

Commit 7ca184a

Browse files
committed
Build 3rdparty include as system
1 parent b29af77 commit 7ca184a

File tree

14 files changed

+23
-23
lines changed

14 files changed

+23
-23
lines changed

3rdparty/7zip/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ if(WIN32 OR APPLE)
5959
7zip/C/XzEnc.c
6060
7zip/C/XzIn.c
6161
7zip/C/ZstdDec.c)
62-
target_include_directories(3rdparty_7zip INTERFACE
62+
target_include_directories(3rdparty_7zip SYSTEM INTERFACE
6363
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/7zip/C>
6464
$<INSTALL_INTERFACE:/7zip/C>)
6565

66-
target_include_directories(3rdparty_7zip INTERFACE 7zip)
66+
target_include_directories(3rdparty_7zip SYSTEM INTERFACE 7zip)
6767

6868
set_property(TARGET 3rdparty_7zip PROPERTY FOLDER "3rdparty/")
6969

3rdparty/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if (USE_SYSTEM_FLATBUFFERS)
3535
message(FATAL_ERROR "flatc failed to regenerate flatbuffers headers.")
3636
endif()
3737
else()
38-
target_include_directories(3rdparty_flatbuffers INTERFACE flatbuffers/include)
38+
target_include_directories(3rdparty_flatbuffers SYSTEM INTERFACE flatbuffers/include)
3939
endif()
4040

4141
# libPNG
@@ -56,7 +56,7 @@ if (USE_SYSTEM_VULKAN_MEMORY_ALLOCATOR)
5656
add_library(3rdparty::vulkanmemoryallocator ALIAS GPUOpen::VulkanMemoryAllocator)
5757
else()
5858
add_library(3rdparty_vulkanmemoryallocator INTERFACE)
59-
target_include_directories(3rdparty_vulkanmemoryallocator INTERFACE GPUOpen/VulkanMemoryAllocator/include)
59+
target_include_directories(3rdparty_vulkanmemoryallocator SYSTEM INTERFACE GPUOpen/VulkanMemoryAllocator/include)
6060
add_library(3rdparty::vulkanmemoryallocator ALIAS 3rdparty_vulkanmemoryallocator)
6161
endif()
6262

@@ -111,7 +111,7 @@ if (NOT ANDROID)
111111
find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
112112

113113
add_library(3rdparty_opengl INTERFACE)
114-
target_include_directories(3rdparty_opengl INTERFACE GL)
114+
target_include_directories(3rdparty_opengl SYSTEM INTERFACE GL)
115115

116116
if (WIN32)
117117
if(NOT MSVC)
@@ -204,7 +204,7 @@ if(USE_VULKAN)
204204
find_package(Wayland)
205205
if (WAYLAND_FOUND)
206206
target_include_directories(3rdparty_vulkan
207-
INTERFACE ${WAYLAND_INCLUDE_DIR})
207+
SYSTEM INTERFACE ${WAYLAND_INCLUDE_DIR})
208208
endif()
209209
endif()
210210

@@ -298,7 +298,7 @@ if(NOT ANDROID)
298298
message(STATUS "RPCS3: using shared ffmpeg")
299299
find_package(FFMPEG REQUIRED)
300300

301-
target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR})
301+
target_include_directories(3rdparty_ffmpeg SYSTEM INTERFACE ${FFMPEG_INCLUDE_DIR})
302302
target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES})
303303
else()
304304
message(STATUS "RPCS3: using builtin ffmpeg")
@@ -328,7 +328,7 @@ if(NOT ANDROID)
328328
${FFMPEG_LIB_SWSCALE}
329329
${FFMPEG_LIB_SWRESAMPLE}
330330
)
331-
target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include")
331+
target_include_directories(3rdparty_ffmpeg SYSTEM INTERFACE "ffmpeg/include")
332332
endif()
333333
endif()
334334

3rdparty/asmjit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(ASMJIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/asmjit" CACHE PATH "Location of 'asm
99
include("${ASMJIT_DIR}/CMakeLists.txt")
1010

1111
add_library(asmjit ${ASMJIT_SRC})
12-
target_include_directories(asmjit PUBLIC ${ASMJIT_DIR}/src)
12+
target_include_directories(asmjit SYSTEM PUBLIC ${ASMJIT_DIR}/src)
1313
target_link_libraries(asmjit PRIVATE ${ASMJIT_DEPS})
1414

1515
# ASMJIT should have a option for disabling installing and this wouldnt

3rdparty/discord-rpc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
99
set(WARNINGS_AS_ERRORS FALSE CACHE BOOL "When enabled, compiles with `-Werror` (on *nix platforms).")
1010

1111
add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
12-
target_include_directories(3rdparty_discordRPC INTERFACE discord-rpc/include)
12+
target_include_directories(3rdparty_discordRPC SYSTEM INTERFACE discord-rpc/include)
1313
target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC)
1414
target_link_libraries(3rdparty_discordRPC INTERFACE discord-rpc)
1515
endif()

3rdparty/feralinteractive/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
add_library(3rdparty_feralinteractive INTERFACE)
44

55
if (CMAKE_SYSTEM MATCHES "Linux")
6-
target_include_directories(3rdparty_feralinteractive INTERFACE feralinteractive/lib)
6+
target_include_directories(3rdparty_feralinteractive SYSTEM INTERFACE feralinteractive/lib)
77
target_compile_definitions(3rdparty_feralinteractive INTERFACE -DGAMEMODE_AVAILABLE)
88
target_link_libraries(3rdparty_feralinteractive INTERFACE feralinteractive)
99
endif()

3rdparty/glslang/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(USE_SYSTEM_GLSLANG)
77
target_link_libraries(3rdparty_glslang INTERFACE glslang::SPIRV)
88
get_target_property(SPIRV_INCLUDE_DIRS glslang::SPIRV INTERFACE_INCLUDE_DIRECTORIES)
99
list(TRANSFORM SPIRV_INCLUDE_DIRS APPEND "/glslang")
10-
target_include_directories(3rdparty_glslang INTERFACE ${SPIRV_INCLUDE_DIRS})
10+
target_include_directories(3rdparty_glslang SYSTEM INTERFACE ${SPIRV_INCLUDE_DIRS})
1111
else()
1212
set(ENABLE_PCH OFF CACHE BOOL "Enables Precompiled header" FORCE)
1313
set(BUILD_EXTERNAL OFF CACHE BOOL "Build external dependencies in /External" FORCE)

3rdparty/hidapi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(USE_SYSTEM_HIDAPI)
44
pkg_check_modules(hidapi-hidraw REQUIRED IMPORTED_TARGET hidapi-hidraw)
55
add_library(3rdparty_hidapi INTERFACE)
66
target_link_libraries(3rdparty_hidapi INTERFACE PkgConfig::hidapi-hidraw)
7-
target_include_directories(3rdparty_hidapi INTERFACE PkgConfig::hidapi-hidraw)
7+
target_include_directories(3rdparty_hidapi SYSTEM INTERFACE PkgConfig::hidapi-hidraw)
88
else()
99
set(BUILD_SHARED_LIBS FALSE CACHE BOOL "Don't build shared libs")
1010
set(HIDAPI_INSTALL_TARGETS FALSE CACHE BOOL "Don't install anything")

3rdparty/libpng/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ if (NOT USE_SYSTEM_LIBPNG)
66
set(PNG_TESTS OFF CACHE BOOL "Build libpng tests")
77
set(SKIP_INSTALL_ALL ON)
88
add_subdirectory(libpng EXCLUDE_FROM_ALL)
9-
target_include_directories(png_static INTERFACE "${libpng_BINARY_DIR}" "${libpng_SOURCE_DIR}")
9+
target_include_directories(png_static SYSTEM INTERFACE "${libpng_BINARY_DIR}" "${libpng_SOURCE_DIR}")
1010

1111
set(LIBPNG_TARGET png_static PARENT_SCOPE)
1212
else()
1313
find_package(PNG REQUIRED)
1414

1515
add_library(3rdparty_system_libpng INTERFACE)
16-
target_include_directories(3rdparty_system_libpng INTERFACE ${PNG_INCLUDE_DIR})
16+
target_include_directories(3rdparty_system_libpng SYSTEM INTERFACE ${PNG_INCLUDE_DIR})
1717
target_link_libraries(3rdparty_system_libpng INTERFACE ${PNG_LIBRARY})
1818
target_compile_definitions(3rdparty_system_libpng INTERFACE ${PNG_DEFINITIONS})
1919

3rdparty/llvm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ if(WITH_LLVM)
107107

108108
add_library(3rdparty_llvm INTERFACE)
109109
target_link_libraries(3rdparty_llvm INTERFACE ${LLVM_LIBS})
110-
target_include_directories(3rdparty_llvm INTERFACE ${LLVM_INCLUDE_DIRS})
110+
target_include_directories(3rdparty_llvm SYSTEM INTERFACE ${LLVM_INCLUDE_DIRS})
111111
separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
112112
target_compile_definitions(3rdparty_llvm INTERFACE ${LLVM_DEFINITIONS_LIST} LLVM_AVAILABLE)
113113

3rdparty/miniupnp/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ if(USE_SYSTEM_MINIUPNPC)
33
pkg_check_modules(MiniUPnPc REQUIRED IMPORTED_TARGET miniupnpc>=2.3.3)
44
add_library(3rdparty_miniupnpc INTERFACE)
55
target_link_libraries(3rdparty_miniupnpc INTERFACE PkgConfig::MiniUPnPc)
6-
target_include_directories(3rdparty_miniupnpc INTERFACE PkgConfig::MiniUPnPc)
6+
target_include_directories(3rdparty_miniupnpc SYSTEM INTERFACE PkgConfig::MiniUPnPc)
77
list(TRANSFORM MiniUPnPc_INCLUDE_DIRS APPEND "/miniupnpc")
8-
target_include_directories(3rdparty_miniupnpc INTERFACE ${MiniUPnPc_INCLUDE_DIRS})
8+
target_include_directories(3rdparty_miniupnpc SYSTEM INTERFACE ${MiniUPnPc_INCLUDE_DIRS})
99
else()
1010
option (UPNPC_BUILD_STATIC "Build static library" TRUE)
1111
option (UPNPC_BUILD_SHARED "Build shared library" FALSE)
@@ -17,5 +17,5 @@ else()
1717
add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL)
1818
add_library(3rdparty_miniupnpc INTERFACE)
1919
target_link_libraries(3rdparty_miniupnpc INTERFACE libminiupnpc-static)
20-
target_include_directories(3rdparty_miniupnpc INTERFACE libminiupnpc-static)
20+
target_include_directories(3rdparty_miniupnpc SYSTEM INTERFACE libminiupnpc-static)
2121
endif()

0 commit comments

Comments
 (0)