Skip to content

Commit 4ffe88e

Browse files
authored
Merge pull request #9732 from Icinga/silence-compiler-warnings-in-code-we-don-t-maintain
Silence compiler warnings in code we don't maintain
2 parents cddb3ca + 6195a45 commit 4ffe88e

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -186,21 +186,21 @@ add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
186186
add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
187187

188188
link_directories(${Boost_LIBRARY_DIRS})
189-
include_directories(${Boost_INCLUDE_DIRS})
189+
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
190190

191191
find_package(OpenSSL REQUIRED)
192-
include_directories(${OPENSSL_INCLUDE_DIR})
192+
include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
193193

194194
set(base_DEPS ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
195195
set(base_OBJS $<TARGET_OBJECTS:mmatch> $<TARGET_OBJECTS:socketpair> $<TARGET_OBJECTS:base>)
196196

197197
# JSON
198198
find_package(JSON)
199-
include_directories(${JSON_INCLUDE})
199+
include_directories(SYSTEM ${JSON_INCLUDE})
200200

201201
# UTF8CPP
202202
find_package(UTF8CPP)
203-
include_directories(${UTF8CPP_INCLUDE})
203+
include_directories(SYSTEM ${UTF8CPP_INCLUDE})
204204

205205
find_package(Editline)
206206
set(HAVE_EDITLINE "${EDITLINE_FOUND}")
@@ -223,12 +223,12 @@ endif()
223223

224224
if(EDITLINE_FOUND)
225225
list(APPEND base_DEPS ${EDITLINE_LIBRARIES})
226-
include_directories(${EDITLINE_INCLUDE_DIR})
226+
include_directories(SYSTEM ${EDITLINE_INCLUDE_DIR})
227227
endif()
228228

229229
if(TERMCAP_FOUND)
230230
list(APPEND base_DEPS ${TERMCAP_LIBRARIES})
231-
include_directories(${TERMCAP_INCLUDE_DIR})
231+
include_directories(SYSTEM ${TERMCAP_INCLUDE_DIR})
232232
endif()
233233

234234
if(WIN32)

icinga-app/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set_target_properties (
1919
FOLDER Lib
2020
)
2121

22-
include_directories(${Boost_INCLUDE_DIRS})
22+
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
2323

2424
if(ICINGA2_WITH_CHECKER)
2525
list(APPEND icinga_app_SOURCES $<TARGET_OBJECTS:checker>)

lib/base/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ if(HAVE_SYSTEMD)
130130
find_path(SYSTEMD_INCLUDE_DIR
131131
NAMES systemd/sd-daemon.h
132132
HINTS ${SYSTEMD_ROOT_DIR})
133-
include_directories(${SYSTEMD_INCLUDE_DIR})
133+
include_directories(SYSTEM ${SYSTEMD_INCLUDE_DIR})
134134
set_property(
135135
SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/journaldlogger.cpp
136136
APPEND PROPERTY COMPILE_DEFINITIONS
@@ -140,13 +140,13 @@ endif()
140140

141141
add_library(base OBJECT ${base_SOURCES})
142142

143-
include_directories(${icinga2_SOURCE_DIR}/third-party/execvpe)
143+
include_directories(SYSTEM ${icinga2_SOURCE_DIR}/third-party/execvpe)
144144
link_directories(${icinga2_BINARY_DIR}/third-party/execvpe)
145145

146-
include_directories(${icinga2_SOURCE_DIR}/third-party/mmatch)
146+
include_directories(SYSTEM ${icinga2_SOURCE_DIR}/third-party/mmatch)
147147
link_directories(${icinga2_BINARY_DIR}/third-party/mmatch)
148148

149-
include_directories(${icinga2_SOURCE_DIR}/third-party/socketpair)
149+
include_directories(SYSTEM ${icinga2_SOURCE_DIR}/third-party/socketpair)
150150
link_directories(${icinga2_BINARY_DIR}/third-party/socketpair)
151151

152152
set_target_properties (

lib/db_ido_mysql/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif()
1212

1313
add_library(db_ido_mysql OBJECT ${db_ido_mysql_SOURCES})
1414

15-
include_directories(${MYSQL_INCLUDE_DIR})
15+
include_directories(SYSTEM ${MYSQL_INCLUDE_DIR})
1616

1717
add_dependencies(db_ido_mysql base config icinga db_ido)
1818

lib/db_ido_pgsql/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif()
1212

1313
add_library(db_ido_pgsql OBJECT ${db_ido_pgsql_SOURCES})
1414

15-
include_directories(${PostgreSQL_INCLUDE_DIRS})
15+
include_directories(SYSTEM ${PostgreSQL_INCLUDE_DIRS})
1616

1717
add_dependencies(db_ido_pgsql base config icinga db_ido)
1818

lib/icingadb/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ endif()
1515

1616
add_library(icingadb OBJECT ${icingadb_SOURCES})
1717

18-
include_directories(${icinga2_SOURCE_DIR}/third-party)
18+
include_directories(SYSTEM ${icinga2_SOURCE_DIR}/third-party)
1919

2020
add_dependencies(icingadb base config icinga remote)
2121

lib/mysql_shim/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
22

3-
include_directories(${MYSQL_INCLUDE_DIR})
3+
include_directories(SYSTEM ${MYSQL_INCLUDE_DIR})
44

55
set(mysql_shim_SOURCES
66
mysql_shim.def

lib/pgsql_shim/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
22

33
link_directories(${PostgreSQL_LIBRARY_DIRS})
4-
include_directories(${PostgreSQL_INCLUDE_DIRS})
4+
include_directories(SYSTEM ${PostgreSQL_INCLUDE_DIRS})
55

66
set(pgsql_shim_SOURCES
77
pgsql_shim.def

third-party/cmake/BoostTestTargets.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ function(add_boost_test _name)
130130

131131
if(Boost_FOUND)
132132

133-
include_directories(${Boost_INCLUDE_DIRS})
133+
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
134134

135135
set(includeType)
136136
foreach(src ${SOURCES})

0 commit comments

Comments
 (0)