Skip to content

Commit

Permalink
Silence compiler warnings in code we don't maintain
Browse files Browse the repository at this point in the history
  • Loading branch information
Al2Klimov committed Mar 24, 2023
1 parent 66b039d commit c6ee729
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,21 +179,21 @@ add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)

link_directories(${Boost_LIBRARY_DIRS})
include_directories(${Boost_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})

find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})

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

# JSON
find_package(JSON)
include_directories(${JSON_INCLUDE})
include_directories(SYSTEM ${JSON_INCLUDE})

# UTF8CPP
find_package(UTF8CPP)
include_directories(${UTF8CPP_INCLUDE})
include_directories(SYSTEM ${UTF8CPP_INCLUDE})

find_package(Editline)
set(HAVE_EDITLINE "${EDITLINE_FOUND}")
Expand All @@ -216,12 +216,12 @@ endif()

if(EDITLINE_FOUND)
list(APPEND base_DEPS ${EDITLINE_LIBRARIES})
include_directories(${EDITLINE_INCLUDE_DIR})
include_directories(SYSTEM ${EDITLINE_INCLUDE_DIR})
endif()

if(TERMCAP_FOUND)
list(APPEND base_DEPS ${TERMCAP_LIBRARIES})
include_directories(${TERMCAP_INCLUDE_DIR})
include_directories(SYSTEM ${TERMCAP_INCLUDE_DIR})
endif()

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion icinga-app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set_target_properties (
FOLDER Lib
)

include_directories(${Boost_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})

if(ICINGA2_WITH_CHECKER)
list(APPEND icinga_app_SOURCES $<TARGET_OBJECTS:checker>)
Expand Down
8 changes: 4 additions & 4 deletions lib/base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ if(HAVE_SYSTEMD)
find_path(SYSTEMD_INCLUDE_DIR
NAMES systemd/sd-daemon.h
HINTS ${SYSTEMD_ROOT_DIR})
include_directories(${SYSTEMD_INCLUDE_DIR})
include_directories(SYSTEM ${SYSTEMD_INCLUDE_DIR})
set_property(
SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/journaldlogger.cpp
APPEND PROPERTY COMPILE_DEFINITIONS
Expand All @@ -139,13 +139,13 @@ endif()

add_library(base OBJECT ${base_SOURCES})

include_directories(${icinga2_SOURCE_DIR}/third-party/execvpe)
include_directories(SYSTEM ${icinga2_SOURCE_DIR}/third-party/execvpe)
link_directories(${icinga2_BINARY_DIR}/third-party/execvpe)

include_directories(${icinga2_SOURCE_DIR}/third-party/mmatch)
include_directories(SYSTEM ${icinga2_SOURCE_DIR}/third-party/mmatch)
link_directories(${icinga2_BINARY_DIR}/third-party/mmatch)

include_directories(${icinga2_SOURCE_DIR}/third-party/socketpair)
include_directories(SYSTEM ${icinga2_SOURCE_DIR}/third-party/socketpair)
link_directories(${icinga2_BINARY_DIR}/third-party/socketpair)

set_target_properties (
Expand Down
2 changes: 1 addition & 1 deletion lib/db_ido_mysql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif()

add_library(db_ido_mysql OBJECT ${db_ido_mysql_SOURCES})

include_directories(${MYSQL_INCLUDE_DIR})
include_directories(SYSTEM ${MYSQL_INCLUDE_DIR})

add_dependencies(db_ido_mysql base config icinga db_ido)

Expand Down
2 changes: 1 addition & 1 deletion lib/db_ido_pgsql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif()

add_library(db_ido_pgsql OBJECT ${db_ido_pgsql_SOURCES})

include_directories(${PostgreSQL_INCLUDE_DIRS})
include_directories(SYSTEM ${PostgreSQL_INCLUDE_DIRS})

add_dependencies(db_ido_pgsql base config icinga db_ido)

Expand Down
2 changes: 1 addition & 1 deletion lib/icingadb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif()

add_library(icingadb OBJECT ${icingadb_SOURCES})

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

add_dependencies(icingadb base config icinga remote)

Expand Down
2 changes: 1 addition & 1 deletion lib/mysql_shim/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+

include_directories(${MYSQL_INCLUDE_DIR})
include_directories(SYSTEM ${MYSQL_INCLUDE_DIR})

set(mysql_shim_SOURCES
mysql_shim.def
Expand Down
2 changes: 1 addition & 1 deletion lib/pgsql_shim/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+

link_directories(${PostgreSQL_LIBRARY_DIRS})
include_directories(${PostgreSQL_INCLUDE_DIRS})
include_directories(SYSTEM ${PostgreSQL_INCLUDE_DIRS})

set(pgsql_shim_SOURCES
pgsql_shim.def
Expand Down
2 changes: 1 addition & 1 deletion third-party/cmake/BoostTestTargets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function(add_boost_test _name)

if(Boost_FOUND)

include_directories(${Boost_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})

set(includeType)
foreach(src ${SOURCES})
Expand Down

0 comments on commit c6ee729

Please sign in to comment.