From fc747976e4004743fb5a0beb02dd3b745fcff408 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 15 Apr 2020 10:38:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/doc | 2 +- src/cmlib-example/CMakeLists.txt | 20 ++++++++++++++++---- thirdparty/myxlib | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index 3c0fd21..0b69005 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 3c0fd214b9ad8bd9306aba18b37d7078319654b1 +Subproject commit 0b69005b7a05760d538c0902e634848b62f3cda1 diff --git a/cmake/doc b/cmake/doc index 81fe901..acdfb6a 160000 --- a/cmake/doc +++ b/cmake/doc @@ -1 +1 @@ -Subproject commit 81fe90131c2d93d5d3e0f3b48c38fad0418fb953 +Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357 diff --git a/src/cmlib-example/CMakeLists.txt b/src/cmlib-example/CMakeLists.txt index c0a9a22..31f0ccf 100644 --- a/src/cmlib-example/CMakeLists.txt +++ b/src/cmlib-example/CMakeLists.txt @@ -76,15 +76,15 @@ add_pvs_check(${TRGT}) # Qt5: подключение заголовочных файлов -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}) +target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${TRGT} PUBLIC ${Qt5Gui_INCLUDE_DIRS}) +target_include_directories(${TRGT} PUBLIC ${Qt5Widgets_INCLUDE_DIRS}) # Qt5: подключение библиотек target_link_libraries(${TRGT} Qt5::Core Qt5::Gui Qt5::Widgets) # Добавление к пути поиска заголовочных файлов -target_include_directories(${TRGT} SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) +target_include_directories(${TRGT} PUBLIC ${Boost_INCLUDE_DIRS}) # Зависимость от библиотеки из внешнего проекта проекта add_dependencies(${TRGT} myxlib) @@ -100,5 +100,17 @@ target_link_libraries(${TRGT} myx-qt myx-filesystem myx-base) set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME ${TRGT} RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) + +# Подключение настроек для динамического анализа программы +add_sanitizers(${TRGT}) + +# Подключение возможности использования утилиты Gcov +# для исследования покрытия кода +add_code_coverage(${TRGT}) + +# Подключение возможности включения пакетного режима обработки +# исходных файлов в генераторах для ускорения сборки +cotire(${TRGT}) + # Правила для установки install(TARGETS ${TRGT} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/thirdparty/myxlib b/thirdparty/myxlib index bea1da9..d5729fa 160000 --- a/thirdparty/myxlib +++ b/thirdparty/myxlib @@ -1 +1 @@ -Subproject commit bea1da9c1517c18163ea67bb30ea9308fb1397da +Subproject commit d5729fa806b0b664bbe066721612235b6bc8d3da