Обновление к текущему состоянию документации

This commit is contained in:
Andrei Astafev 2020-04-22 21:24:11 +03:00
parent 92a8ede405
commit 1df1b091ed
6 changed files with 6 additions and 27 deletions

View File

@ -21,7 +21,7 @@ include(CMLibCommon)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED OFF)
set(Boost_USE_STATIC_RUNTIME ON)
find_package(Boost 1.55.0 REQUIRED COMPONENTS headers)
find_package(Boost 1.55.0 REQUIRED)
# Qt5
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)

@ -1 +1 @@
Subproject commit 0b69005b7a05760d538c0902e634848b62f3cda1
Subproject commit 197e5b3939709a0cc4924e44c355aa8ad7358b8e

View File

@ -5,25 +5,5 @@ set(DOXYGEN_PROJECT_TITLE "Пример проекта приложения")
set(DOXYGEN_GENERATE_LATEX YES)
set(DOXYGEN_GENERATE_HTML YES)
set(CPACK_GENERATOR "TXZ;DEB")
set(CPACK_PACKAGE_CONTACT "John Doe <box@mail.domain>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMLib application project example")
set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
set(CPACK_SOURCE_IGNORE_FILES
"${CMAKE_BINARY_DIR}"
"/\\\\.git/"
"/\\\\.gitlab-ci/"
"^${CMAKE_SOURCE_DIR}/.?build.?/"
"^${CMAKE_SOURCE_DIR}/.?output.?/"
"^${CMAKE_SOURCE_DIR}/files/lib"
"^${CMAKE_SOURCE_DIR}/files/log"
"\\\\.clang-tidy$"
"\\\\.cmake-format$"
"\\\\.gitignore$"
"\\\\.gitattributes$"
"\\\\.gitmodules$"
"\\\\.gitlab-ci.yml"
"CMakeLists.txt.user.*"
"~$"
"\\\\.swp$")

@ -1 +1 @@
Subproject commit eb34f3ffb32205b382c4ee56de890b5de9371fa7
Subproject commit 0cd764fc187ab3b66cb31a5549f13b3336858894

View File

@ -80,9 +80,8 @@ target_include_directories(${TRGT} PUBLIC $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/
# Компоновка с библиотеками из внешнего проекта
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})
# Имя выходного файла для цели
set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME ${TRGT})
# Правила для установки
install(TARGETS ${TRGT} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

2
thirdparty/myxlib vendored

@ -1 +1 @@
Subproject commit d5729fa806b0b664bbe066721612235b6bc8d3da
Subproject commit f550594b85be0e40d6368c78b4812d04597fb53e