From d5729fa806b0b664bbe066721612235b6bc8d3da Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 15 Apr 2020 10:34:34 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 576bafd70b6548ad9fc8e336d1743da5502bc059. --- examples/filesystem/01_minimal/CMakeLists.txt | 2 +- examples/qt/01_translators/CMakeLists.txt | 2 +- src/myx/base/CMakeLists.txt | 2 +- src/myx/filesystem/CMakeLists.txt | 4 ++-- src/myx/math/CMakeLists.txt | 4 ++-- src/myx/qt/CMakeLists.txt | 4 ++-- src/myx/redis/CMakeLists.txt | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/filesystem/01_minimal/CMakeLists.txt b/examples/filesystem/01_minimal/CMakeLists.txt index 296b774..779aceb 100644 --- a/examples/filesystem/01_minimal/CMakeLists.txt +++ b/examples/filesystem/01_minimal/CMakeLists.txt @@ -31,7 +31,7 @@ add_dependencies(${TRGT} base_static) add_dependencies(${TRGT} filesystem_static) target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_link_libraries(${TRGT} myx-filesystem) target_link_libraries(${TRGT} Qt5::Core) diff --git a/examples/qt/01_translators/CMakeLists.txt b/examples/qt/01_translators/CMakeLists.txt index 25672f3..e8f64cb 100644 --- a/examples/qt/01_translators/CMakeLists.txt +++ b/examples/qt/01_translators/CMakeLists.txt @@ -38,7 +38,7 @@ add_dependencies(${TRGT} qt_static) # Qt5 target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_link_libraries(${TRGT} myx-qt) target_link_libraries(${TRGT} Qt5::Core) diff --git a/src/myx/base/CMakeLists.txt b/src/myx/base/CMakeLists.txt index eef53eb..23f255f 100644 --- a/src/myx/base/CMakeLists.txt +++ b/src/myx/base/CMakeLists.txt @@ -31,7 +31,7 @@ add_pvs_check(${TRGT}) # Создание цели для автоматического форматирования кода add_format_sources(${TRGT} ${TRGT_sources} ${TRGT_headers}) -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) cotire(${TRGT}) diff --git a/src/myx/filesystem/CMakeLists.txt b/src/myx/filesystem/CMakeLists.txt index b5910c0..17e9c1d 100644 --- a/src/myx/filesystem/CMakeLists.txt +++ b/src/myx/filesystem/CMakeLists.txt @@ -33,8 +33,8 @@ add_pvs_check(${TRGT}) # Создание цели для автоматического форматирования кода add_format_sources(${TRGT} ${TRGT_sources} ${TRGT_headers}) -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) -target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include) cotire(${TRGT}) diff --git a/src/myx/math/CMakeLists.txt b/src/myx/math/CMakeLists.txt index 5473c58..199e71d 100644 --- a/src/myx/math/CMakeLists.txt +++ b/src/myx/math/CMakeLists.txt @@ -42,8 +42,8 @@ add_pvs_check(${TRGT}) # Создание цели для автоматического форматирования кода add_format_sources(${TRGT} ${TRGT_sources} ${TRGT_headers}) -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) -target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include) cotire(${TRGT}) diff --git a/src/myx/qt/CMakeLists.txt b/src/myx/qt/CMakeLists.txt index c5594f6..5e4079c 100644 --- a/src/myx/qt/CMakeLists.txt +++ b/src/myx/qt/CMakeLists.txt @@ -30,8 +30,8 @@ add_pvs_check(${TRGT}) # Создание цели для автоматического форматирования кода add_format_sources(${TRGT} ${TRGT_sources} ${TRGT_headers}) -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) -target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) cotire(${TRGT}) diff --git a/src/myx/redis/CMakeLists.txt b/src/myx/redis/CMakeLists.txt index c014fc9..23617b2 100644 --- a/src/myx/redis/CMakeLists.txt +++ b/src/myx/redis/CMakeLists.txt @@ -38,9 +38,9 @@ add_pvs_check(${TRGT}) # Создание цели для автоматического форматирования кода add_format_sources(${TRGT} ${TRGT_sources} ${TRGT_headers}) -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) -target_include_directories(${TRGT} PUBLIC ${Qt5Network_INCLUDE_DIRS}) -target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Network_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include) cotire(${TRGT})