f1x1t/cmex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Обновление CMakeLists.txt

Browse Source
This commit is contained in:
Andrei Astafev 2019-04-15 03:29:57 +03:00
parent 427053f55d
commit 9ae75c2035
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -52,3 +52,14 @@ add_subdirectory(src/libcmex)
# Приложение # Приложение
add_subdirectory(src/cmex) 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"
)

2
cmake/cmlib

@ -1 +1 @@
Subproject commit e90a2d9e7ec05393c29eaa0e01a412d30e5939cf Subproject commit 2980180da0080ba58111f3f71ef63fe72d877e5a

1
l10n/cmex_app_ru_RU.ts
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1" language="ru_RU"> <TS version="2.1" language="ru_RU">
<context> <context>

17
src/cmex/CMakeLists.txt
View File

@ -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 ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Gui_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Gui_INCLUDE_DIRS})
target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Widgets_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Widgets_INCLUDE_DIRS})
target_link_libraries(${current_target} Qt5::Core) target_compile_options(${current_target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
target_link_libraries(${current_target} Qt5::Gui)
target_link_libraries(${current_target} Qt5::Widgets)
# Зависимость от библиотеки из текущего проекта # Зависимость от библиотеки из текущего проекта
add_dependencies(${current_target} cmex) add_dependencies(${current_target} cmex)
@ -55,9 +53,20 @@ target_link_libraries(${current_target} cmex_static)
# Библиотека из внешнего проекта cmext # Библиотека из внешнего проекта cmext
target_link_libraries(${current_target} ${CMAKE_BINARY_DIR}/lib/libcmext.a) 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}) 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)