From 9ae75c2035cdc79ad41e0c0da9cf2795766879e3 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Mon, 15 Apr 2019 03:29:57 +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=20CMakeLists.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt          | 11 +++++++++++
 cmake/cmlib             |  2 +-
 l10n/cmex_app_ru_RU.ts  |  1 +
 src/cmex/CMakeLists.txt | 17 +++++++++++++----
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc3c785..8513f8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,3 +52,14 @@ add_subdirectory(src/libcmex)
 # Приложение
 add_subdirectory(src/cmex)
 
+add_breathe_doc(
+  SOURCE_DIR ${CMAKE_SOURCE_DIR}/docs/breathe
+  BUILD_DIR  ${CMAKE_BINARY_DIR}
+  CACHE_DIR  ${CMAKE_BINARY_DIR}/_doctrees
+  HTML_DIR   ${CMAKE_BINARY_DIR}/html
+  DOXY_FILE  ${CMAKE_SOURCE_DIR}/docs/breathe/Doxyfile.in
+  CONF_FILE  ${CMAKE_SOURCE_DIR}/docs/breathe/conf.py.in
+  TARGET_NAME breathe-docs
+  COMMENT "Breathe HTML documentation"
+  )
+
diff --git a/cmake/cmlib b/cmake/cmlib
index e90a2d9..2980180 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit e90a2d9e7ec05393c29eaa0e01a412d30e5939cf
+Subproject commit 2980180da0080ba58111f3f71ef63fe72d877e5a
diff --git a/l10n/cmex_app_ru_RU.ts b/l10n/cmex_app_ru_RU.ts
index 9a12091..1c75511 100644
--- a/l10n/cmex_app_ru_RU.ts
+++ b/l10n/cmex_app_ru_RU.ts
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
 <context>
diff --git a/src/cmex/CMakeLists.txt b/src/cmex/CMakeLists.txt
index cf18f7c..4b6dae9 100644
--- a/src/cmex/CMakeLists.txt
+++ b/src/cmex/CMakeLists.txt
@@ -21,9 +21,7 @@ qt_translation(TARGET ${current_target} TS_DIR ${CMAKE_SOURCE_DIR}/l10n LANGUAGE
 target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
 target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Gui_INCLUDE_DIRS})
 target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Widgets_INCLUDE_DIRS})
-target_link_libraries(${current_target} Qt5::Core)
-target_link_libraries(${current_target} Qt5::Gui)
-target_link_libraries(${current_target} Qt5::Widgets)
+target_compile_options(${current_target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
 
 # Зависимость от библиотеки из текущего проекта
 add_dependencies(${current_target} cmex)
@@ -55,9 +53,20 @@ target_link_libraries(${current_target} cmex_static)
 
 # Библиотека из внешнего проекта cmext
 target_link_libraries(${current_target} ${CMAKE_BINARY_DIR}/lib/libcmext.a)
+target_link_libraries(${current_target} Qt5::Core)
+target_link_libraries(${current_target} Qt5::Gui)
+target_link_libraries(${current_target} Qt5::Widgets)
 
-cotire(${current_target})
+# cotire(${current_target})
 
 # Правила для установки
 install(TARGETS ${current_target} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+#include(PVS-Studio)
+#pvs_studio_add_target(TARGET ${current_target}_pvs
+#    ANALYZE ${current_target}
+#    ALL
+#    HIDE_HELP
+#    COMPILE_COMANDS
+#    OUTPUT FORMAT errorfile
+#    MODE GA:1,2,3;64:1;OP:1,2;CS:1,2)