diff --git a/cmake/cmlib b/cmake/cmlib index 0b69005..3c0fd21 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 0b69005b7a05760d538c0902e634848b62f3cda1 +Subproject commit 3c0fd214b9ad8bd9306aba18b37d7078319654b1 diff --git a/cmake/doc b/cmake/doc index acdfb6a..81fe901 160000 --- a/cmake/doc +++ b/cmake/doc @@ -1 +1 @@ -Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357 +Subproject commit 81fe90131c2d93d5d3e0f3b48c38fad0418fb953 diff --git a/src/cmlib-example/CMakeLists.txt b/src/cmlib-example/CMakeLists.txt index 1789d89..918ac92 100644 --- a/src/cmlib-example/CMakeLists.txt +++ b/src/cmlib-example/CMakeLists.txt @@ -60,15 +60,15 @@ add_executable(${TRGT} ${TRGT_ui_h} ${TRGT_moc_cpp} ${TRGT_qrc_cpp} ${TRGT_cpp}) common_target_properties(${TRGT}) # Qt5: подключение заголовочных файлов -target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) -target_include_directories(${TRGT} PUBLIC ${Qt5Gui_INCLUDE_DIRS}) -target_include_directories(${TRGT} PUBLIC ${Qt5Widgets_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Gui_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Widgets_INCLUDE_DIRS}) # Qt5: подключение библиотек target_link_libraries(${TRGT} Qt5::Core Qt5::Gui Qt5::Widgets) # Добавление к пути поиска заголовочных файлов -target_include_directories(${TRGT} PUBLIC ${Boost_INCLUDE_DIRS}) +target_include_directories(${TRGT} SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) # Зависимость от библиотеки из внешнего проекта проекта add_dependencies(${TRGT} myxlib) diff --git a/thirdparty/myxlib b/thirdparty/myxlib index 576bafd..bea1da9 160000 --- a/thirdparty/myxlib +++ b/thirdparty/myxlib @@ -1 +1 @@ -Subproject commit 576bafd70b6548ad9fc8e336d1743da5502bc059 +Subproject commit bea1da9c1517c18163ea67bb30ea9308fb1397da